n8n 2.44.3 → 2.45.0

package/dist/modules/agents/agent-skills.service.d.ts

@@ -1,36 +1,35 @@
-import { type AgentJsonConfig, type AgentSkill, type AgentSkillMutationResponse } from '@n8n/api-types';
+import { type AgentSkillAvailability, type AgentSkill, type AgentSkillMutationResponse, type SkillCreateMethod } from '@n8n/api-types';
 import { Logger } from '@n8n/backend-common';
 import { TransactionRunner } from '@n8n/db';
 import { type AgentMutationTelemetryContext } from './agent-modification-telemetry.service';
 import { AgentSaveCompletionService } from './agent-save-completion.service';
 import { AgentSkillRefsService } from './agent-skill-refs.service';
-import { Agent } from './entities/agent.entity';
 import { AgentRepository } from './repositories/agent.repository';
+import { SkillService } from './skills/skill.service';
+import { SkillsTelemetry } from './skills/skills-telemetry';
 import { type SkillInstructionEdit } from './utils/skill-instruction-edits';
 export declare class AgentSkillsService {
     private readonly logger;
     private readonly agentRepository;
     private readonly saveCompletion;
     private readonly agentSkillRefs;
+    private readonly skillService;
     private readonly transactionRunner;
-    constructor(logger: Logger, agentRepository: AgentRepository, saveCompletion: AgentSaveCompletionService, agentSkillRefs: AgentSkillRefsService, transactionRunner: TransactionRunner);
+    private readonly skillsTelemetry;
+    constructor(logger: Logger, agentRepository: AgentRepository, saveCompletion: AgentSaveCompletionService, agentSkillRefs: AgentSkillRefsService, skillService: SkillService, transactionRunner: TransactionRunner, skillsTelemetry: SkillsTelemetry);
     listSkills(agentId: string, projectId: string): Promise<Record<string, AgentSkill>>;
     getSkill(agentId: string, projectId: string, skillId: string): Promise<AgentSkill>;
-    createSkill(agentId: string, projectId: string, skill: AgentSkill, context: AgentMutationTelemetryContext): Promise<AgentSkillMutationResponse>;
     createAndAttachSkills(agentId: string, projectId: string, skills: AgentSkill[], context: AgentMutationTelemetryContext): Promise<{
         skills: AgentSkillMutationResponse[];
         configHash: string | null;
     }>;
-    createAndAttachSkill(agentId: string, projectId: string, skill: AgentSkill, context: AgentMutationTelemetryContext): Promise<AgentSkillMutationResponse>;
+    createAndAttachSkill(agentId: string, projectId: string, skill: AgentSkill, context: AgentMutationTelemetryContext, availableTo?: AgentSkillAvailability, method?: SkillCreateMethod): Promise<AgentSkillMutationResponse>;
     private createSkillsBatch;
-    updateSkill(agentId: string, projectId: string, skillId: string, updates: Partial<AgentSkill>, context: AgentMutationTelemetryContext, baseSkillHash?: string, instructionEdits?: SkillInstructionEdit[]): Promise<AgentSkillMutationResponse>;
+    updateSkill(agentId: string, projectId: string, skillId: string, updates: Partial<AgentSkill>, context: AgentMutationTelemetryContext, baseSkillHash?: string, instructionEdits?: SkillInstructionEdit[], availableTo?: AgentSkillAvailability): Promise<AgentSkillMutationResponse>;
     deleteSkill(agentId: string, projectId: string, skillId: string, context: AgentMutationTelemetryContext): Promise<void>;
-    removeUnreferencedSkills(entity: Agent, config: AgentJsonConfig): void;
+    private availabilityChange;
+    private updateLegacySkill;
     private validateSkill;
-    private addSkill;
-    private assertSkillNameIsUnique;
-    private normalizeSkillName;
-    private assertBatchSkillNamesAreUnique;
-    private attachSkillRef;
-    private saveSkillChanges;
+    private assertCanCreateSkills;
+    private assertNoNameClashes;
 }

package/dist/modules/agents/agent-skills.service.js

@@ -20,214 +20,302 @@ const di_1 = require("@n8n/di");
 const isEqual_1 = __importDefault(require("lodash/isEqual"));
 const n8n_workflow_1 = require("n8n-workflow");
 const errors_1 = require("@n8n/errors");
+const permissions_1 = require("@n8n/permissions");
+const check_access_1 = require("../../permissions.ee/check-access");
 const agent_modification_telemetry_service_1 = require("./agent-modification-telemetry.service");
 const agent_save_completion_service_1 = require("./agent-save-completion.service");
 const agent_skill_refs_service_1 = require("./agent-skill-refs.service");
-const agent_draft_utils_1 = require("./utils/agent-draft.utils");
+const agent_config_composition_1 = require("./json-config/agent-config-composition");
 const agent_repository_1 = require("./repositories/agent.repository");
-const get_agent_or_throw_1 = require("./utils/get-agent-or-throw");
+const skill_names_1 = require("./skills/skill-names");
+const skill_service_1 = require("./skills/skill.service");
+const skills_telemetry_1 = require("./skills/skills-telemetry");
 const agent_config_hash_1 = require("./utils/agent-config-hash");
-const agent_config_composition_1 = require("./json-config/agent-config-composition");
-const agent_resource_id_1 = require("./utils/agent-resource-id");
+const agent_draft_utils_1 = require("./utils/agent-draft.utils");
+const get_agent_or_throw_1 = require("./utils/get-agent-or-throw");
 const skill_instruction_edits_1 = require("./utils/skill-instruction-edits");
 let AgentSkillsService = class AgentSkillsService {
-    constructor(logger, agentRepository, saveCompletion, agentSkillRefs, transactionRunner) {
+    constructor(logger, agentRepository, saveCompletion, agentSkillRefs, skillService, transactionRunner, skillsTelemetry) {
         this.logger = logger;
         this.agentRepository = agentRepository;
         this.saveCompletion = saveCompletion;
         this.agentSkillRefs = agentSkillRefs;
+        this.skillService = skillService;
         this.transactionRunner = transactionRunner;
+        this.skillsTelemetry = skillsTelemetry;
     }
     async listSkills(agentId, projectId) {
         const entity = await (0, get_agent_or_throw_1.getAgentOrThrow)(this.agentRepository, agentId, projectId, 'Agent not found');
-        return entity.skills ?? {};
+        if (!this.agentSkillRefs.usesSkillsHub)
+            return entity.skills ?? {};
+        return (await this.agentSkillRefs.readDraft(entity, {})).skills;
     }
     async getSkill(agentId, projectId, skillId) {
         const skills = await this.listSkills(agentId, projectId);
-        const skill = skills[skillId];
+        const skill = Object.hasOwn(skills, skillId) ? skills[skillId] : undefined;
         if (!skill)
             throw new errors_1.NotFoundError('Skill not found');
         return skill;
     }
-    async createSkill(agentId, projectId, skill, context) {
-        const { results } = await this.createSkillsBatch(agentId, projectId, [skill], false, context);
-        return results[0];
-    }
     async createAndAttachSkills(agentId, projectId, skills, context) {
-        const { results, saved, skillRefs } = await this.createSkillsBatch(agentId, projectId, skills, true, context);
+        const { results, saved, skillRefs } = await this.createSkillsBatch(agentId, projectId, skills, context);
         return {
             skills: results,
             configHash: (0, agent_config_hash_1.getAgentConfigHash)((0, agent_config_composition_1.composeJsonConfig)(saved, skillRefs)),
         };
     }
-    async createAndAttachSkill(agentId, projectId, skill, context) {
-        const { results } = await this.createSkillsBatch(agentId, projectId, [skill], true, context);
+    async createAndAttachSkill(agentId, projectId, skill, context, availableTo = 'project', method) {
+        const { results } = await this.createSkillsBatch(agentId, projectId, [skill], context, availableTo, method);
         return results[0];
     }
-    async createSkillsBatch(agentId, projectId, skills, attach, context) {
+    async createSkillsBatch(agentId, projectId, skills, context, availableTo = 'project', method) {
         if (skills.length === 0) {
             throw new n8n_workflow_1.UserError('At least one skill is required.');
         }
         const entity = await (0, get_agent_or_throw_1.getAgentOrThrow)(this.agentRepository, agentId, projectId, 'Agent not found');
-        if (attach && !entity.schema)
+        if (!entity.schema)
             throw new n8n_workflow_1.UserError('Agent has no JSON config yet.');
-        for (const skill of skills) {
-            this.validateSkill(skill);
+        const bodies = skills.map((skill) => {
+            const validated = this.validateSkill(skill);
+            return this.agentSkillRefs.usesSkillsHub
+                ? (0, skill_service_1.withTrimmedName)(toStoredSkill(validated))
+                : validated;
+        });
+        if (this.agentSkillRefs.usesSkillsHub) {
+            await this.assertCanCreateSkills(context.user, entity.projectId, availableTo);
         }
-        this.assertBatchSkillNamesAreUnique(entity.skills ?? {}, skills);
-        const previousSkillRefs = await this.agentSkillRefs.refsForDraft(entity, {});
-        const previous = (0, agent_modification_telemetry_service_1.captureAgentMutation)(entity, previousSkillRefs);
-        const results = skills.map((skill) => ({ id: this.addSkill(entity, skill), skill }));
-        let skillRefs = previousSkillRefs;
-        if (attach) {
-            for (const { id } of results)
-                skillRefs = this.attachSkillRef(skillRefs, id);
-        }
-        const saved = await this.saveSkillChanges(entity, projectId, context, previous, previousSkillRefs, attach ? { refs: skillRefs } : undefined);
-        this.logger.debug(attach ? 'Created and attached agent skill' : 'Created agent skills', {
-            agentId,
-            projectId,
-            skillIds: results.map((r) => r.id),
+        const previous = await this.agentSkillRefs.readDraft(entity, {});
+        this.assertNoNameClashes(previous.skills, bodies);
+        const snapshot = (0, agent_modification_telemetry_service_1.captureAgentMutation)(entity, previous.skillRefs);
+        (0, agent_draft_utils_1.markAgentDraftDirty)(entity);
+        const { ids, skillRefs } = await this.transactionRunner.run({}, async (ctx) => {
+            await (0, agent_draft_utils_1.saveAgentDraftFenced)(this.agentRepository, entity, ctx);
+            const created = await this.agentSkillRefs.createSkills(entity, bodies, context.user.id, availableTo, ctx);
+            const nextRefs = [
+                ...(previous.skillRefs ?? []),
+                ...created.map((id) => ({ type: 'skill', id })),
+            ];
+            await this.agentSkillRefs.replaceDraftRefs(entity, nextRefs, ctx);
+            return {
+                ids: created,
+                skillRefs: await this.agentSkillRefs.refsForDraft(entity, ctx),
+            };
         });
+        await this.saveCompletion.bodySaved((0, agent_modification_telemetry_service_1.buildAgentMutationEvent)(entity, skillRefs, projectId, context, snapshot, { skills: true }), context.pushRef);
+        this.logger.debug('Created and attached agent skills', { agentId, projectId, skillIds: ids });
+        if (this.agentSkillRefs.usesSkillsHub) {
+            await this.skillsTelemetry.created(context.user.id, ids, telemetrySourceOf(context), telemetryMethodOf(context, method));
+        }
         return {
-            results: results.map((r) => ({
-                ...r,
-                skillHash: (0, agent_config_hash_1.getAgentSkillHash)(r.skill),
-                versionId: saved.versionId,
+            results: ids.map((id, index) => ({
+                id,
+                skill: bodies[index],
+                skillHash: (0, agent_config_hash_1.getAgentSkillHash)(bodies[index]),
+                versionId: entity.versionId,
             })),
-            saved,
+            saved: entity,
             skillRefs,
         };
     }
-    async updateSkill(agentId, projectId, skillId, updates, context, baseSkillHash, instructionEdits) {
+    async updateSkill(agentId, projectId, skillId, updates, context, baseSkillHash, instructionEdits, availableTo) {
         const entity = await (0, get_agent_or_throw_1.getAgentOrThrow)(this.agentRepository, agentId, projectId, 'Agent not found');
-        const existing = entity.skills?.[skillId];
+        const skillRefs = (await this.agentSkillRefs.refsForDraft(entity, {})) ?? [];
+        const ref = skillRefs.find((candidate) => candidate.id === skillId);
+        const existing = !this.agentSkillRefs.usesSkillsHub
+            ?
+                legacyBody(entity, skillId)
+            : ref && (await this.agentSkillRefs.skillsForRefs(entity, [ref], {}))[skillId];
         if (!existing)
             throw new errors_1.NotFoundError('Skill not found');
         if (baseSkillHash !== undefined && baseSkillHash !== (0, agent_config_hash_1.getAgentSkillHash)(existing)) {
             throw new errors_1.ConflictError('Skill was changed elsewhere; reload to get the latest version');
         }
-        const updated = { ...existing, ...updates };
+        const { allowedTools, ...changes } = updates;
+        const updated = { ...existing, ...changes };
+        if (!this.agentSkillRefs.usesSkillsHub && 'allowedTools' in updates) {
+            if (allowedTools?.length)
+                updated.allowedTools = allowedTools;
+            else
+                delete updated.allowedTools;
+        }
         if (instructionEdits?.length) {
             if (updates.instructions !== undefined) {
                 throw new n8n_workflow_1.UserError('Pass either instructions or instructionEdits, not both.');
             }
             updated.instructions = (0, skill_instruction_edits_1.applySkillInstructionEdits)(existing.instructions, instructionEdits);
         }
-        if ('allowedTools' in updates && !updates.allowedTools?.length)
-            delete updated.allowedTools;
         if ('references' in updates && !updates.references?.length)
             delete updated.references;
         this.validateSkill(updated);
-        this.assertSkillNameIsUnique(entity.skills ?? {}, updated.name, skillId);
+        const nextAvailability = await this.availabilityChange(skillId, availableTo);
+        let checkedSource;
+        if (nextAvailability) {
+            await this.skillService.assertCanEdit(context.user, [skillId]);
+            checkedSource = await this.skillService.assertCanMove(context.user, skillId);
+            await this.assertCanCreateSkills(context.user, entity.projectId, nextAvailability);
+        }
         if ((0, isEqual_1.default)(existing, updated)) {
+            if (nextAvailability) {
+                await this.agentSkillRefs.setAvailability(entity, skillId, nextAvailability, {}, {
+                    checkedSource,
+                });
+            }
             return {
                 id: skillId,
-                skill: updated,
-                skillHash: (0, agent_config_hash_1.getAgentSkillHash)(updated),
+                skill: existing,
+                skillHash: (0, agent_config_hash_1.getAgentSkillHash)(existing),
                 versionId: entity.versionId,
             };
         }
-        const skillRefs = await this.agentSkillRefs.refsForDraft(entity, {});
-        const previous = (0, agent_modification_telemetry_service_1.captureAgentMutation)(entity, skillRefs);
-        entity.skills = {
-            ...(entity.skills ?? {}),
-            [skillId]: updated,
-        };
-        const saved = await this.saveSkillChanges(entity, projectId, context, previous, skillRefs);
-        this.logger.debug('Updated agent skill', { agentId, projectId, skillId });
+        if (!this.agentSkillRefs.usesSkillsHub) {
+            return await this.updateLegacySkill(entity, skillRefs, skillId, updated, projectId, context);
+        }
+        const pinned = ref?.versionId !== undefined;
+        if (pinned) {
+            const latest = (await this.agentSkillRefs.skillsForRefs(entity, [{ type: 'skill', id: skillId }], {}))[skillId];
+            if (!latest || (0, agent_config_hash_1.getAgentSkillHash)(latest) !== (0, agent_config_hash_1.getAgentSkillHash)(existing)) {
+                throw new n8n_workflow_1.UserError('This agent uses an older version of this skill. Use the latest version first, then edit the skill. To use the latest version, remove versionId from the skill ref in the agent config.');
+            }
+        }
+        await this.skillService.assertCanEdit(context.user, [skillId]);
+        const snapshot = (0, agent_modification_telemetry_service_1.captureAgentMutation)(entity, skillRefs);
+        if (pinned)
+            (0, agent_draft_utils_1.markAgentDraftDirty)(entity);
+        const saved = await this.transactionRunner.run({}, async (ctx) => {
+            if (nextAvailability) {
+                await this.agentSkillRefs.setAvailability(entity, skillId, nextAvailability, ctx, {
+                    nameAfterMove: updated.name,
+                    checkedSource,
+                });
+            }
+            if (pinned) {
+                await (0, agent_draft_utils_1.saveAgentDraftFenced)(this.agentRepository, entity, ctx);
+                await this.agentSkillRefs.unpinDraftRef(entity, skillId, ctx);
+            }
+            return await this.skillService.save(skillId, {
+                name: updated.name,
+                description: updated.description,
+                instructions: updated.instructions,
+                references: updated.references ?? [],
+                baseSkillHash: (0, agent_config_hash_1.getAgentSkillHash)(existing),
+            }, context.user.id, ctx);
+        });
+        await this.skillService.refreshFollowingAgents(saved.followingAgentIds.filter((id) => id !== entity.id), context.pushRef);
+        const fresh = (await this.agentRepository.findByIdAndProjectId(entity.id, projectId)) ?? entity;
+        await this.saveCompletion.bodySaved((0, agent_modification_telemetry_service_1.buildAgentMutationEvent)(fresh, await this.agentSkillRefs.refsForDraft(fresh, {}), projectId, context, snapshot, { skills: true }), context.pushRef);
+        if (saved.created) {
+            await this.skillsTelemetry.updated(context.user.id, skillId, telemetrySourceOf(context), saved.version, nextAvailability !== undefined);
+        }
+        this.logger.debug('Updated agent skill', {
+            agentId,
+            projectId,
+            skillId,
+            version: saved.version,
+            created: saved.created,
+        });
         return {
             id: skillId,
-            skill: updated,
-            skillHash: (0, agent_config_hash_1.getAgentSkillHash)(updated),
-            versionId: saved.versionId,
+            skill: saved.skill,
+            skillHash: (0, agent_config_hash_1.getAgentSkillHash)(saved.skill),
+            versionId: fresh.versionId,
         };
     }
     async deleteSkill(agentId, projectId, skillId, context) {
         const entity = await (0, get_agent_or_throw_1.getAgentOrThrow)(this.agentRepository, agentId, projectId, 'Agent not found');
-        const skills = { ...(entity.skills ?? {}) };
-        if (!skills[skillId])
-            throw new errors_1.NotFoundError('Skill not found');
         const previousSkillRefs = await this.agentSkillRefs.refsForDraft(entity, {});
-        const previous = (0, agent_modification_telemetry_service_1.captureAgentMutation)(entity, previousSkillRefs);
-        delete skills[skillId];
-        entity.skills = skills;
-        await this.saveSkillChanges(entity, projectId, context, previous, previousSkillRefs, previousSkillRefs
-            ? { refs: previousSkillRefs.filter((ref) => ref.id !== skillId) }
-            : undefined);
-        this.logger.debug('Deleted agent skill', { agentId, projectId, skillId });
-    }
-    removeUnreferencedSkills(entity, config) {
-        const referencedSkillIds = new Set((config.skills ?? []).map((t) => t.id));
-        const orphanSkillIds = Object.keys(entity.skills ?? {}).filter((id) => !referencedSkillIds.has(id));
-        if (orphanSkillIds.length === 0)
-            return;
-        const skills = { ...(entity.skills ?? {}) };
-        for (const id of orphanSkillIds) {
-            delete skills[id];
+        if (!previousSkillRefs?.some((ref) => ref.id === skillId)) {
+            throw new errors_1.NotFoundError('Skill not found');
         }
-        entity.skills = skills;
+        const snapshot = (0, agent_modification_telemetry_service_1.captureAgentMutation)(entity, previousSkillRefs);
+        (0, agent_draft_utils_1.markAgentDraftDirty)(entity);
+        const skillRefs = await this.transactionRunner.run({}, async (ctx) => {
+            await (0, agent_draft_utils_1.saveAgentDraftFenced)(this.agentRepository, entity, ctx);
+            await this.agentSkillRefs.replaceDraftRefs(entity, previousSkillRefs.filter((ref) => ref.id !== skillId), ctx);
+            return await this.agentSkillRefs.refsForDraft(entity, ctx);
+        });
+        await this.saveCompletion.bodySaved((0, agent_modification_telemetry_service_1.buildAgentMutationEvent)(entity, skillRefs, projectId, context, snapshot, { skills: true }), context.pushRef);
+        this.logger.debug('Detached agent skill', { agentId, projectId, skillId });
+    }
+    async availabilityChange(skillId, availableTo) {
+        if (availableTo === undefined || !this.agentSkillRefs.usesSkillsHub)
+            return undefined;
+        const current = await this.agentSkillRefs.availabilityOf(skillId, {});
+        return current === availableTo ? undefined : availableTo;
+    }
+    async updateLegacySkill(entity, skillRefs, skillId, updated, projectId, context) {
+        const { [skillId]: _self, ...others } = entity.skills ?? {};
+        this.assertNoNameClashes(others, [updated]);
+        const snapshot = (0, agent_modification_telemetry_service_1.captureAgentMutation)(entity, skillRefs);
+        entity.skills = { ...entity.skills, [skillId]: updated };
+        (0, agent_draft_utils_1.markAgentDraftDirty)(entity);
+        await this.transactionRunner.run({}, async (ctx) => {
+            await (0, agent_draft_utils_1.saveAgentDraftFenced)(this.agentRepository, entity, ctx);
+        });
+        await this.saveCompletion.bodySaved((0, agent_modification_telemetry_service_1.buildAgentMutationEvent)(entity, skillRefs, projectId, context, snapshot, { skills: true }), context.pushRef);
+        this.logger.debug('Updated agent skill', { agentId: entity.id, projectId, skillId });
+        return {
+            id: skillId,
+            skill: updated,
+            skillHash: (0, agent_config_hash_1.getAgentSkillHash)(updated),
+            versionId: entity.versionId,
+        };
     }
     validateSkill(skill) {
         const result = api_types_1.agentSkillSchema.safeParse(skill);
         if (!result.success) {
             throw new n8n_workflow_1.UserError(`Invalid agent skill: ${result.error.issues[0]?.message ?? 'Invalid skill'}`);
         }
+        return result.data;
     }
-    addSkill(entity, skill) {
-        const skillId = (0, agent_resource_id_1.generateAgentResourceId)('skill', Object.keys(entity.skills ?? {}));
-        entity.skills = {
-            ...(entity.skills ?? {}),
-            [skillId]: skill,
-        };
-        return skillId;
-    }
-    assertSkillNameIsUnique(existing, name, currentSkillId) {
-        const normalizedName = this.normalizeSkillName(name);
-        const duplicate = Object.entries(existing ?? {}).find(([id, skill]) => id !== currentSkillId && this.normalizeSkillName(skill.name) === normalizedName);
-        if (duplicate) {
-            throw new n8n_workflow_1.UserError(`Agent already has a skill named "${name.trim()}".`);
-        }
-    }
-    normalizeSkillName(name) {
-        return name.trim().toLowerCase();
-    }
-    assertBatchSkillNamesAreUnique(existing, skills) {
-        const seenNames = new Set();
-        for (const skill of skills) {
-            this.assertSkillNameIsUnique(existing, skill.name);
-            const normalizedName = this.normalizeSkillName(skill.name);
-            if (seenNames.has(normalizedName)) {
-                throw new n8n_workflow_1.UserError(`Duplicate skill name in batch: "${skill.name.trim()}".`);
+    async assertCanCreateSkills(user, projectId, availableTo) {
+        if (availableTo === 'agent')
+            return;
+        if (availableTo === 'instance') {
+            if (!(0, permissions_1.hasGlobalScope)(user, 'skill:create')) {
+                throw new errors_1.ForbiddenError('You are not allowed to create skills for the whole instance.');
             }
-            seenNames.add(normalizedName);
+            return;
+        }
+        if (!(await (0, check_access_1.userHasScopes)(user, ['projectSkill:create'], false, { projectId }))) {
+            throw new errors_1.ForbiddenError('You are not allowed to create skills for this project.');
         }
     }
-    attachSkillRef(skillRefs, skillId) {
-        return [
-            ...(skillRefs ?? []).filter((ref) => ref.id !== skillId),
-            { type: 'skill', id: skillId },
-        ];
-    }
-    async saveSkillChanges(entity, projectId, context, previous, currentSkillRefs, nextSkillRefs) {
-        (0, agent_draft_utils_1.markAgentDraftDirty)(entity);
-        const saved = await this.transactionRunner.run({}, async (ctx) => {
-            await (0, agent_draft_utils_1.saveAgentDraftFenced)(this.agentRepository, entity, ctx);
-            if (nextSkillRefs) {
-                await this.agentSkillRefs.replaceDraftRefs(entity, nextSkillRefs.refs, ctx);
-            }
-            return entity;
-        });
-        const savedSkillRefs = nextSkillRefs ? nextSkillRefs.refs : currentSkillRefs;
-        await this.saveCompletion.bodySaved((0, agent_modification_telemetry_service_1.buildAgentMutationEvent)(saved, savedSkillRefs, projectId, context, previous, {
-            skills: true,
-        }), context.pushRef);
-        return saved;
+    assertNoNameClashes(existing, added) {
+        const quote = (names) => names.map((name) => name.trim()).join('", "');
+        const existingNames = Object.values(existing).map((skill) => skill.name);
+        const clashes = added
+            .map((skill) => skill.name)
+            .filter((name) => (0, skill_names_1.findIntroducedNameClashes)(existingNames, [name]).length > 0);
+        if (clashes.length > 0) {
+            throw new n8n_workflow_1.UserError(`Agent already has a skill with a name like "${quote(clashes)}".`);
+        }
+        const inBatch = (0, skill_names_1.findNameClashGroups)(added.map((skill) => skill.name));
+        if (inBatch.length > 0) {
+            throw new n8n_workflow_1.UserError(`The new skills "${quote(inBatch[0])}" are hard to tell apart.`);
+        }
     }
 };
 exports.AgentSkillsService = AgentSkillsService;
 exports.AgentSkillsService = AgentSkillsService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [backend_common_1.Logger, agent_repository_1.AgentRepository, agent_save_completion_service_1.AgentSaveCompletionService, agent_skill_refs_service_1.AgentSkillRefsService, db_1.TransactionRunner])
+    __metadata("design:paramtypes", [backend_common_1.Logger, agent_repository_1.AgentRepository, agent_save_completion_service_1.AgentSaveCompletionService, agent_skill_refs_service_1.AgentSkillRefsService, skill_service_1.SkillService, db_1.TransactionRunner, skills_telemetry_1.SkillsTelemetry])
 ], AgentSkillsService);
+function legacyBody(agent, skillId) {
+    const skills = agent.skills ?? {};
+    return Object.hasOwn(skills, skillId) ? skills[skillId] : undefined;
+}
+function toStoredSkill(skill) {
+    return {
+        name: skill.name,
+        description: skill.description,
+        instructions: skill.instructions,
+        ...(skill.references?.length ? { references: skill.references } : {}),
+    };
+}
+function telemetrySourceOf(context) {
+    return context.modifiedBy === 'mcp' ? 'mcp' : 'agent';
+}
+function telemetryMethodOf(context, method) {
+    return context.modifiedBy === 'user' ? (method ?? 'manual') : 'ai';
+}
 //# sourceMappingURL=agent-skills.service.js.map

package/dist/modules/agents/agent-skills.service.js.map

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

package/dist/modules/agents/agent-task.service.js

@@ -29,6 +29,7 @@ const agent_skill_refs_service_1 = require("./agent-skill-refs.service");
 const agents_settings_service_1 = require("./agents-settings.service");
 const agent_task_job_registrar_1 = require("./scheduling/agent-task-job-registrar");
 const task_timezone_1 = require("./scheduling/task-timezone");
+const agent_entity_1 = require("./entities/agent.entity");
 const cron_validation_1 = require("./integrations/cron-validation");
 const agent_repository_1 = require("./repositories/agent.repository");
 const get_agent_or_throw_1 = require("./utils/get-agent-or-throw");
@@ -174,7 +175,7 @@ let AgentTaskService = class AgentTaskService {
             where: { id: agentId },
             relations: { activeVersion: true },
         });
-        if (!agent?.activeVersionId) {
+        if (!agent?.activeVersionId || !(0, agent_entity_1.isProjectAgent)(agent)) {
             this.deregisterAgentTasks(agentId);
             return;
         }
@@ -198,10 +199,10 @@ let AgentTaskService = class AgentTaskService {
     async reconnectAll() {
         if (this.durableJobRegistrar.isEnabled())
             return;
-        const agents = await this.agentRepository.find({
+        const agents = (await this.agentRepository.find({
             where: { activeVersionId: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) },
             relations: { activeVersion: true },
-        });
+        })).filter(agent_entity_1.isProjectAgent);
         this.logger.debug('[AgentTaskService] Reconnecting published agents', { count: agents.length });
         for (const agent of agents) {
             try {
@@ -283,7 +284,7 @@ let AgentTaskService = class AgentTaskService {
         const snapshot = agent?.activeVersionId
             ? await this.taskSnapshotRepository.findByVersionAndTaskId(agent.activeVersionId, taskId)
             : null;
-        if (!agent?.activeVersionId || !snapshot?.enabled) {
+        if (!agent?.activeVersionId || !snapshot?.enabled || !(0, agent_entity_1.isProjectAgent)(agent)) {
             this.logger.warn('[AgentTaskService] Task fired but is no longer published and enabled', {
                 taskId,
                 agentId,
@@ -379,7 +380,7 @@ let AgentTaskService = class AgentTaskService {
     async runNow(agentId, taskId, user) {
         const task = await this.getOrThrow(agentId, taskId);
         const agent = await this.agentRepository.findOne({ where: { id: agentId } });
-        if (!agent) {
+        if (!agent || !(0, agent_entity_1.isProjectAgent)(agent)) {
             throw new errors_1.NotFoundError(`Agent "${agentId}" not found`);
         }
         void this.executeNow(task, agent.projectId, user);