From 21ff42074daa446aaf0df38189ad496addbe4cda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Malfait?= <felix.malfait@gmail.com>
Date: Fri, 2 Jan 2026 15:22:01 +0100
Subject: [PATCH] feat: implement skills system for AI agents (#16865)

## Summary
This PR introduces a Skills system for AI agents, inspired by the [Agent
Skills specification](https://agentskills.io/specification).

## Changes

### Backend
- **SkillEntity**: New database entity with migration for storing skills
- **V2 Sync Mechanism**: Implemented FlatSkill, builders, validators,
and action handlers following the v2 flat entity pattern
- **Standard Skills**: Pre-defined skills (workflow-building,
data-manipulation, dashboard-building, metadata-building, research,
code-interpreter, xlsx, pdf, docx, pptx)
- **GraphQL API**: CRUD operations for skills with proper guards and
permissions
- **Workspace Cache**: Integrated skills into the workspace cache system

### Frontend
- **Skills Table**: Searchable table in AI settings showing all skills
- **Skill Form**: Create/edit page with Label (primary), Description,
and Content (markdown editor)
- **API Name**: Following existing patterns, name is derived from label
with advanced settings toggle for custom API names
- **Standard vs Custom**: Standard skills are read-only, custom skills
can be edited/deleted

## Key Design Decisions
- Skills are stored in the database (Salesforce-like approach) rather
than files
- Name is derived from Label by default (isLabelSyncedWithName pattern)
- Skills reference functions/files via @ mentions in markdown content
rather than explicit relations
- Standard skills are synced from code, custom skills are created via UI

## Screenshots
Skills table and form UI follow existing settings patterns.

## Testing
- [x] Lint passes
- [x] Typecheck passes
- [ ] CI tests
---
 .github/workflows/ci-server.yaml              |    4 +-
 packages/twenty-front/package.json            |   32 +-
 .../src/generated-metadata/graphql.ts         |  368 ++++++
 .../twenty-front/src/generated/graphql.ts     |   16 +
 .../hooks/useAdvancedTextEditor.ts            |   24 +-
 .../ai/graphql/fragments/skillFragment.ts     |   16 +
 .../ai/graphql/mutations/activateSkill.ts     |   12 +
 .../ai/graphql/mutations/createSkill.ts       |   12 +
 .../ai/graphql/mutations/deactivateSkill.ts   |   12 +
 .../ai/graphql/mutations/deleteSkill.ts       |   12 +
 .../ai/graphql/mutations/updateSkill.ts       |   12 +
 .../ai/graphql/queries/findManySkills.ts      |   12 +
 .../ai/graphql/queries/findOneSkill.ts        |   12 +
 .../modules/app/components/SettingsRoutes.tsx |   14 +
 .../hooks/useMetadataErrorHandler.ts          |    1 +
 .../components/FormAdvancedTextFieldInput.tsx |   17 +-
 .../src/pages/settings/ai/SettingsAI.tsx      |   72 +-
 .../pages/settings/ai/SettingsSkillForm.tsx   |  600 ++++++++++
 .../settings/ai/components/SettingsAIMCP.tsx  |   18 +-
 .../SettingsSkillInactiveMenuDropDown.tsx     |   69 ++
 .../ai/components/SettingsSkillTableRow.tsx   |   62 +
 .../ai/components/SettingsSkillsTable.tsx     |  227 ++++
 .../constants/SettingsSkillTableMetadata.ts   |   26 +
 .../common/1767003000000-add-skill-entity.ts  |   43 +
 .../skills/skill-definition.type.ts           |    6 -
 .../core-modules/skills/skills.module.ts      |    9 -
 .../core-modules/skills/skills.service.ts     |   66 --
 .../skills/skills/code-interpreter.skill.ts   |  105 --
 .../skills/skills/dashboard-building.skill.ts |   78 --
 .../skills/skills/data-manipulation.skill.ts  |   44 -
 .../core-modules/skills/skills/docx.skill.ts  |  152 ---
 .../skills/skills/metadata-building.skill.ts  |   64 -
 .../core-modules/skills/skills/pdf.skill.ts   |  131 ---
 .../core-modules/skills/skills/pptx.skill.ts  |  170 ---
 .../skills/skills/research.skill.ts           |   34 -
 .../skills/skills/workflow-building.skill.ts  |   62 -
 .../core-modules/skills/skills/xlsx.skill.ts  |  131 ---
 .../tool-provider/tools/load-skill.tool.ts    |    6 +-
 .../constants/dollar-to-credit-multiplier.ts  |    4 +-
 .../convert-cents-to-billing-credits.util.ts  |    4 +-
 .../ai/ai-chat/ai-chat.module.ts              |    4 +-
 .../constants/chat-system-prompts.const.ts    |    6 +
 .../services/chat-execution.service.ts        |   23 +-
 .../constants/dollar-to-credit-multiplier.ts  |    4 +-
 ...rties-to-compare-and-stringify.constant.ts |    5 +
 ...metadata-many-to-one-relations.constant.ts |    1 +
 ...-metadata-relations-properties.constant.ts |    4 +
 ...quired-metadata-for-validation.constant.ts |    1 +
 .../all-flat-entity-types-by-metadata-name.ts |   16 +
 ...flat-skill-editable-properties.constant.ts |   10 +
 .../flat-skill/flat-skill.module.ts           |   16 +
 .../workspace-flat-skill-map-cache.service.ts |   44 +
 .../flat-skill/types/flat-skill-maps.type.ts  |    4 +
 .../flat-skill/types/flat-skill.type.ts       |    4 +
 ...kill-input-to-flat-skill-to-create.util.ts |   45 +
 ...skill-input-to-flat-skill-or-throw.util.ts |   38 +
 .../from-flat-skill-to-skill-dto.util.ts      |   18 +
 ...t-to-flat-skill-to-update-or-throw.util.ts |   50 +
 ...ansform-skill-entity-to-flat-skill.util.ts |   23 +
 .../metadata-engine.module.ts                 |    3 +
 .../skill/dtos/create-skill.input.ts          |   31 +
 .../metadata-modules/skill/dtos/skill.dto.ts  |   65 +
 .../skill/dtos/update-skill.input.ts          |   49 +
 .../skill/entities/skill.entity.ts            |   54 +
 ...skill-graphql-api-exception.interceptor.ts |   20 +
 .../metadata-modules/skill/skill.exception.ts |   40 +
 .../metadata-modules/skill/skill.module.ts    |   29 +
 .../metadata-modules/skill/skill.resolver.ts  |   81 ++
 .../metadata-modules/skill/skill.service.ts   |  381 ++++++
 ...kill-graphql-api-exception-handler.util.ts |   32 +
 .../types/workspace-cache-key.type.ts         |    1 +
 .../constants/standard-skill.constant.ts      |   37 +
 ...nty-standard-all-metadata-name.constant.ts |    1 +
 .../types/all-standard-skill-name.type.ts     |    3 +
 ...-standard-flat-skill-metadata-maps.util.ts |   25 +
 ...reate-standard-flat-skill-metadata.util.ts | 1044 +++++++++++++++++
 ...reate-standard-skill-flat-metadata.util.ts |   46 +
 ...plication-all-flat-entity-maps.constant.ts |   10 +
 ...metadata-validation-response-error.util.ts |    1 +
 ...ce-migration-build-orchestrator.service.ts |   39 +
 ...orkspace-migration-v2-skill-action.type.ts |   18 +
 ...ration-v2-skill-actions-builder.service.ts |   96 ++
 .../services/flat-skill-validator.service.ts  |  217 ++++
 .../validate-skill-name-uniqueness.util.ts    |   25 +
 ...validate-skill-required-properties.util.ts |   51 +
 ...ace-migration-builder-validators.module.ts |    3 +
 .../workspace-migration-builder-v2.module.ts  |    3 +
 .../create-skill-action-handler.service.ts    |   59 +
 .../delete-skill-action-handler.service.ts    |   56 +
 .../update-skill-action-handler.service.ts    |   71 ++
 ...migration-runner-action-handlers.module.ts |    7 +
 ...ny-view-fields-v2.integration-spec.ts.snap |    2 +
 ...ate-view-field-v2.integration-spec.ts.snap |    6 +
 ...ect-on-view-field.integration-spec.ts.snap |   10 +
 ...ng-agent-creation.integration-spec.ts.snap |   14 +
 ...ng-agent-deletion.integration-spec.ts.snap |    2 +
 ...ling-agent-update.integration-spec.ts.snap |   18 +
 ...ne-field-metadata.integration-spec.ts.snap |    2 +
 ...ne-field-metadata.integration-spec.ts.snap |    6 +
 ...ne-field-metadata.integration-spec.ts.snap |    4 +
 ...-metadata-enum-v2.integration-spec.ts.snap |  140 +++
 ...field-metadata-v2.integration-spec.ts.snap |  136 +++
 ...morph-relation-v2.integration-spec.ts.snap |    4 +
 ...morph-relation-v2.integration-spec.ts.snap |   34 +
 ...relation-creation.integration-spec.ts.snap |   64 +
 ...a-relation-update.integration-spec.ts.snap |    2 +
 ...ue-field-metadata.integration-spec.ts.snap |    4 +
 ...bject-metadata-v2.integration-spec.ts.snap |   34 +
 ...e-object-metadata.integration-spec.ts.snap |    8 +
 ...yout-tab-creation.integration-spec.ts.snap |    2 +
 ...t-widget-creation.integration-spec.ts.snap |    2 +
 ...ing-role-creation.integration-spec.ts.snap |   10 +
 ...iling-role-update.integration-spec.ts.snap |   14 +
 ...ng-skill-creation.integration-spec.ts.snap |  268 +++++
 ...ng-skill-deletion.integration-spec.ts.snap |   25 +
 ...ling-skill-update.integration-spec.ts.snap |  173 +++
 ...failing-skill-creation.integration-spec.ts |  128 ++
 ...failing-skill-deletion.integration-spec.ts |   69 ++
 .../failing-skill-update.integration-spec.ts  |  164 +++
 ...ssful-skill-activation.integration-spec.ts |  113 ++
 ...cessful-skill-creation.integration-spec.ts |  147 +++
 ...cessful-skill-deletion.integration-spec.ts |   44 +
 ...uccessful-skill-update.integration-spec.ts |  131 +++
 .../activate-skill-query-factory.util.ts      |   36 +
 .../suites/skill/utils/activate-skill.util.ts |   43 +
 .../utils/create-skill-query-factory.util.ts  |   36 +
 .../suites/skill/utils/create-skill.util.ts   |   43 +
 .../deactivate-skill-query-factory.util.ts    |   36 +
 .../skill/utils/deactivate-skill.util.ts      |   43 +
 .../utils/delete-skill-query-factory.util.ts  |   28 +
 .../suites/skill/utils/delete-skill.util.ts   |   43 +
 .../utils/find-skill-query-factory.util.ts    |   36 +
 .../suites/skill/utils/find-skill.util.ts     |   43 +
 .../utils/find-skills-query-factory.util.ts   |   27 +
 .../suites/skill/utils/find-skills.util.ts    |   39 +
 .../utils/update-skill-query-factory.util.ts  |   36 +
 .../suites/skill/utils/update-skill.util.ts   |   43 +
 ...rcular-dependency.integration-spec.ts.snap |    4 +
 ...er-group-creation.integration-spec.ts.snap |    6 +
 ...rcular-dependency.integration-spec.ts.snap |    4 +
 ...lter-group-update.integration-spec.ts.snap |    2 +
 ...w-filter-creation.integration-spec.ts.snap |    6 +
 .../view-group.integration-spec.ts.snap       |    2 +
 .../metadata/all-metadata-name.constant.ts    |    1 +
 .../twenty-shared/src/types/SettingsPath.ts   |    2 +
 yarn.lock                                     |  234 ++--
 146 files changed, 6964 insertions(+), 1282 deletions(-)
 create mode 100644 packages/twenty-front/src/modules/ai/graphql/fragments/skillFragment.ts
 create mode 100644 packages/twenty-front/src/modules/ai/graphql/mutations/activateSkill.ts
 create mode 100644 packages/twenty-front/src/modules/ai/graphql/mutations/createSkill.ts
 create mode 100644 packages/twenty-front/src/modules/ai/graphql/mutations/deactivateSkill.ts
 create mode 100644 packages/twenty-front/src/modules/ai/graphql/mutations/deleteSkill.ts
 create mode 100644 packages/twenty-front/src/modules/ai/graphql/mutations/updateSkill.ts
 create mode 100644 packages/twenty-front/src/modules/ai/graphql/queries/findManySkills.ts
 create mode 100644 packages/twenty-front/src/modules/ai/graphql/queries/findOneSkill.ts
 create mode 100644 packages/twenty-front/src/pages/settings/ai/SettingsSkillForm.tsx
 create mode 100644 packages/twenty-front/src/pages/settings/ai/components/SettingsSkillInactiveMenuDropDown.tsx
 create mode 100644 packages/twenty-front/src/pages/settings/ai/components/SettingsSkillTableRow.tsx
 create mode 100644 packages/twenty-front/src/pages/settings/ai/components/SettingsSkillsTable.tsx
 create mode 100644 packages/twenty-front/src/pages/settings/ai/constants/SettingsSkillTableMetadata.ts
 create mode 100644 packages/twenty-server/src/database/typeorm/core/migrations/common/1767003000000-add-skill-entity.ts
 delete mode 100644 packages/twenty-server/src/engine/core-modules/skills/skill-definition.type.ts
 delete mode 100644 packages/twenty-server/src/engine/core-modules/skills/skills.module.ts
 delete mode 100644 packages/twenty-server/src/engine/core-modules/skills/skills.service.ts
 delete mode 100644 packages/twenty-server/src/engine/core-modules/skills/skills/code-interpreter.skill.ts
 delete mode 100644 packages/twenty-server/src/engine/core-modules/skills/skills/dashboard-building.skill.ts
 delete mode 100644 packages/twenty-server/src/engine/core-modules/skills/skills/data-manipulation.skill.ts
 delete mode 100644 packages/twenty-server/src/engine/core-modules/skills/skills/docx.skill.ts
 delete mode 100644 packages/twenty-server/src/engine/core-modules/skills/skills/metadata-building.skill.ts
 delete mode 100644 packages/twenty-server/src/engine/core-modules/skills/skills/pdf.skill.ts
 delete mode 100644 packages/twenty-server/src/engine/core-modules/skills/skills/pptx.skill.ts
 delete mode 100644 packages/twenty-server/src/engine/core-modules/skills/skills/research.skill.ts
 delete mode 100644 packages/twenty-server/src/engine/core-modules/skills/skills/workflow-building.skill.ts
 delete mode 100644 packages/twenty-server/src/engine/core-modules/skills/skills/xlsx.skill.ts
 create mode 100644 packages/twenty-server/src/engine/metadata-modules/flat-skill/constants/flat-skill-editable-properties.constant.ts
 create mode 100644 packages/twenty-server/src/engine/metadata-modules/flat-skill/flat-skill.module.ts
 create mode 100644 packages/twenty-server/src/engine/metadata-modules/flat-skill/services/workspace-flat-skill-map-cache.service.ts
 create mode 100644 packages/twenty-server/src/engine/metadata-modules/flat-skill/types/flat-skill-maps.type.ts
 create mode 100644 packages/twenty-server/src/engine/metadata-modules/flat-skill/types/flat-skill.type.ts
 create mode 100644 packages/twenty-server/src/engine/metadata-modules/flat-skill/utils/from-create-skill-input-to-flat-skill-to-create.util.ts
 create mode 100644 packages/twenty-server/src/engine/metadata-modules/flat-skill/utils/from-delete-skill-input-to-flat-skill-or-throw.util.ts
 create mode 100644 packages/twenty-server/src/engine/metadata-modules/flat-skill/utils/from-flat-skill-to-skill-dto.util.ts
 create mode 100644 packages/twenty-server/src/engine/metadata-modules/flat-skill/utils/from-update-skill-input-to-flat-skill-to-update-or-throw.util.ts
 create mode 100644 packages/twenty-server/src/engine/metadata-modules/flat-skill/utils/transform-skill-entity-to-flat-skill.util.ts
 create mode 100644 packages/twenty-server/src/engine/metadata-modules/skill/dtos/create-skill.input.ts
 create mode 100644 packages/twenty-server/src/engine/metadata-modules/skill/dtos/skill.dto.ts
 create mode 100644 packages/twenty-server/src/engine/metadata-modules/skill/dtos/update-skill.input.ts
 create mode 100644 packages/twenty-server/src/engine/metadata-modules/skill/entities/skill.entity.ts
 create mode 100644 packages/twenty-server/src/engine/metadata-modules/skill/interceptors/skill-graphql-api-exception.interceptor.ts
 create mode 100644 packages/twenty-server/src/engine/metadata-modules/skill/skill.exception.ts
 create mode 100644 packages/twenty-server/src/engine/metadata-modules/skill/skill.module.ts
 create mode 100644 packages/twenty-server/src/engine/metadata-modules/skill/skill.resolver.ts
 create mode 100644 packages/twenty-server/src/engine/metadata-modules/skill/skill.service.ts
 create mode 100644 packages/twenty-server/src/engine/metadata-modules/skill/utils/skill-graphql-api-exception-handler.util.ts
 create mode 100644 packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-skill.constant.ts
 create mode 100644 packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/types/all-standard-skill-name.type.ts
 create mode 100644 packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/skill-metadata/build-standard-flat-skill-metadata-maps.util.ts
 create mode 100644 packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/skill-metadata/create-standard-flat-skill-metadata.util.ts
 create mode 100644 packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/skill-metadata/create-standard-skill-flat-metadata.util.ts
 create mode 100644 packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/skill/types/workspace-migration-v2-skill-action.type.ts
 create mode 100644 packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/skill/workspace-migration-v2-skill-actions-builder.service.ts
 create mode 100644 packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/services/flat-skill-validator.service.ts
 create mode 100644 packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/utils/validate-skill-name-uniqueness.util.ts
 create mode 100644 packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/utils/validate-skill-required-properties.util.ts
 create mode 100644 packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/skill/services/create-skill-action-handler.service.ts
 create mode 100644 packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/skill/services/delete-skill-action-handler.service.ts
 create mode 100644 packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/skill/services/update-skill-action-handler.service.ts
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/__snapshots__/failing-skill-creation.integration-spec.ts.snap
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/__snapshots__/failing-skill-deletion.integration-spec.ts.snap
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/__snapshots__/failing-skill-update.integration-spec.ts.snap
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/failing-skill-creation.integration-spec.ts
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/failing-skill-deletion.integration-spec.ts
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/failing-skill-update.integration-spec.ts
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/successful-skill-activation.integration-spec.ts
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/successful-skill-creation.integration-spec.ts
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/successful-skill-deletion.integration-spec.ts
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/successful-skill-update.integration-spec.ts
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/utils/activate-skill-query-factory.util.ts
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/utils/activate-skill.util.ts
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/utils/create-skill-query-factory.util.ts
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/utils/create-skill.util.ts
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/utils/deactivate-skill-query-factory.util.ts
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/utils/deactivate-skill.util.ts
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/utils/delete-skill-query-factory.util.ts
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/utils/delete-skill.util.ts
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/utils/find-skill-query-factory.util.ts
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/utils/find-skill.util.ts
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/utils/find-skills-query-factory.util.ts
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/utils/find-skills.util.ts
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/utils/update-skill-query-factory.util.ts
 create mode 100644 packages/twenty-server/test/integration/metadata/suites/skill/utils/update-skill.util.ts

diff --git a/.github/workflows/ci-server.yaml b/.github/workflows/ci-server.yaml
index a0d940de605..6126b14ebed 100644
--- a/.github/workflows/ci-server.yaml
+++ b/.github/workflows/ci-server.yaml
@@ -171,7 +171,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        shard: [1, 2, 3, 4, 5, 6]
+        shard: [1, 2, 3, 4, 5, 6, 7, 8]
     services:
       postgres:
         image: twentycrm/twenty-postgres-spilo
@@ -209,7 +209,7 @@ jobs:
       ANALYTICS_ENABLED: true
       CLICKHOUSE_URL: "http://default:clickhousePassword@localhost:8123/twenty"
       CLICKHOUSE_PASSWORD: clickhousePassword
-      SHARD_COUNTER: 6
+      SHARD_COUNTER: 8
     steps:
       - name: Fetch custom Github Actions and base branch history
         uses: actions/checkout@v4
diff --git a/packages/twenty-front/package.json b/packages/twenty-front/package.json
index 5f275c9aa9c..ebbdf49a417 100644
--- a/packages/twenty-front/package.json
+++ b/packages/twenty-front/package.json
@@ -56,21 +56,22 @@
     "@react-pdf/renderer": "^4.1.6",
     "@scalar/api-reference-react": "^0.4.36",
     "@sentry/react": "^10.27.0",
-    "@tiptap/core": "^3.4.2",
-    "@tiptap/extension-bold": "^3.4.2",
-    "@tiptap/extension-document": "^3.4.2",
-    "@tiptap/extension-hard-break": "^3.4.2",
-    "@tiptap/extension-heading": "^3.4.2",
-    "@tiptap/extension-image": "^3.4.4",
-    "@tiptap/extension-italic": "^3.4.2",
-    "@tiptap/extension-link": "^3.4.2",
+    "@tiptap/core": "3.4.2",
+    "@tiptap/extension-bold": "3.4.2",
+    "@tiptap/extension-document": "3.4.2",
+    "@tiptap/extension-hard-break": "3.4.2",
+    "@tiptap/extension-heading": "3.4.2",
+    "@tiptap/extension-image": "3.4.4",
+    "@tiptap/extension-italic": "3.4.2",
+    "@tiptap/extension-link": "3.4.2",
     "@tiptap/extension-list": "3.4.2",
-    "@tiptap/extension-paragraph": "^3.4.2",
-    "@tiptap/extension-strike": "^3.4.2",
-    "@tiptap/extension-text": "^3.4.2",
-    "@tiptap/extension-underline": "^3.4.2",
-    "@tiptap/extensions": "^3.4.2",
-    "@tiptap/react": "^3.4.2",
+    "@tiptap/extension-paragraph": "3.4.2",
+    "@tiptap/extension-strike": "3.4.2",
+    "@tiptap/extension-text": "3.4.2",
+    "@tiptap/extension-underline": "3.4.2",
+    "@tiptap/extensions": "3.4.2",
+    "@tiptap/react": "3.4.2",
+    "@types/marked": "^6.0.0",
     "@xyflow/react": "^12.4.2",
     "ai": "5.0.52",
     "apollo-link-rest": "^0.9.0",
@@ -90,6 +91,7 @@
     "jwt-decode": "^4.0.0",
     "linkify-react": "^4.1.3",
     "linkifyjs": "^4.1.3",
+    "marked": "^17.0.1",
     "qs": "^6.11.2",
     "react-data-grid": "7.0.0-beta.13",
     "react-datepicker": "^6.7.1",
@@ -120,7 +122,7 @@
     "@lingui/swc-plugin": "^5.6.0",
     "@lingui/vite-plugin": "^5.1.2",
     "@playwright/test": "^1.56.1",
-    "@tiptap/suggestion": "^3.4.2",
+    "@tiptap/suggestion": "3.4.2",
     "@types/apollo-upload-client": "^17.0.2",
     "@types/file-saver": "^2.0.7",
     "@types/js-cookie": "^3.0.3",
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index 0f081a0a511..ab4e353af8f 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -972,6 +972,14 @@ export type CreateServerlessFunctionInput = {
   timeoutSeconds?: InputMaybe<Scalars['Float']>;
 };
 
+export type CreateSkillInput = {
+  content: Scalars['String'];
+  description?: InputMaybe<Scalars['String']>;
+  icon?: InputMaybe<Scalars['String']>;
+  label: Scalars['String'];
+  name: Scalars['String'];
+};
+
 export type CreateViewFieldInput = {
   aggregateOperation?: InputMaybe<AggregateOperations>;
   fieldMetadataId: Scalars['UUID'];
@@ -1807,6 +1815,7 @@ export enum ModelProvider {
 
 export type Mutation = {
   __typename?: 'Mutation';
+  activateSkill: Skill;
   activateWorkflowVersion: Scalars['Boolean'];
   activateWorkspace: Workspace;
   assignRoleToAgent: Scalars['Boolean'];
@@ -1854,9 +1863,11 @@ export type Mutation = {
   createRowLevelPermissionPredicate: RowLevelPermissionPredicate;
   createRowLevelPermissionPredicateGroup: RowLevelPermissionPredicateGroup;
   createSAMLIdentityProvider: SetupSsoOutput;
+  createSkill: Skill;
   createWebhook: Webhook;
   createWorkflowVersionEdge: WorkflowVersionStepChanges;
   createWorkflowVersionStep: WorkflowVersionStepChanges;
+  deactivateSkill: Skill;
   deactivateWorkflowVersion: Scalars['Boolean'];
   deleteApprovedAccessDomain: Scalars['Boolean'];
   deleteCoreView: Scalars['Boolean'];
@@ -1886,6 +1897,7 @@ export type Mutation = {
   deleteRowLevelPermissionPredicate: RowLevelPermissionPredicate;
   deleteRowLevelPermissionPredicateGroup: RowLevelPermissionPredicateGroup;
   deleteSSOIdentityProvider: DeleteSsoOutput;
+  deleteSkill: Skill;
   deleteTwoFactorAuthenticationMethod: DeleteTwoFactorAuthenticationMethodOutput;
   deleteUser: User;
   deleteUserFromWorkspace: UserWorkspace;
@@ -1981,6 +1993,7 @@ export type Mutation = {
   updatePasswordViaResetToken: InvalidatePasswordOutput;
   updateRowLevelPermissionPredicate: RowLevelPermissionPredicate;
   updateRowLevelPermissionPredicateGroup: RowLevelPermissionPredicateGroup;
+  updateSkill: Skill;
   updateUserEmail: Scalars['Boolean'];
   updateWebhook?: Maybe<Webhook>;
   updateWorkflowRunStep: WorkflowAction;
@@ -2005,6 +2018,11 @@ export type Mutation = {
 };
 
 
+export type MutationActivateSkillArgs = {
+  id: Scalars['UUID'];
+};
+
+
 export type MutationActivateWorkflowVersionArgs = {
   workflowVersionId: Scalars['UUID'];
 };
@@ -2228,6 +2246,11 @@ export type MutationCreateSamlIdentityProviderArgs = {
 };
 
 
+export type MutationCreateSkillArgs = {
+  input: CreateSkillInput;
+};
+
+
 export type MutationCreateWebhookArgs = {
   input: CreateWebhookInput;
 };
@@ -2243,6 +2266,11 @@ export type MutationCreateWorkflowVersionStepArgs = {
 };
 
 
+export type MutationDeactivateSkillArgs = {
+  id: Scalars['UUID'];
+};
+
+
 export type MutationDeactivateWorkflowVersionArgs = {
   workflowVersionId: Scalars['UUID'];
 };
@@ -2384,6 +2412,11 @@ export type MutationDeleteSsoIdentityProviderArgs = {
 };
 
 
+export type MutationDeleteSkillArgs = {
+  id: Scalars['UUID'];
+};
+
+
 export type MutationDeleteTwoFactorAuthenticationMethodArgs = {
   twoFactorAuthenticationMethodId: Scalars['UUID'];
 };
@@ -2854,6 +2887,11 @@ export type MutationUpdateRowLevelPermissionPredicateGroupArgs = {
 };
 
 
+export type MutationUpdateSkillArgs = {
+  input: UpdateSkillInput;
+};
+
+
 export type MutationUpdateUserEmailArgs = {
   newEmail: Scalars['String'];
   verifyEmailRedirectPath?: InputMaybe<Scalars['String']>;
@@ -3390,6 +3428,8 @@ export type Query = {
   object: Object;
   objects: ObjectConnection;
   search: SearchResultConnection;
+  skill?: Maybe<Skill>;
+  skills: Array<Skill>;
   validatePasswordResetToken: ValidatePasswordResetTokenOutput;
   versionInfo: VersionInfo;
   webhook?: Maybe<Webhook>;
@@ -3732,6 +3772,11 @@ export type QuerySearchArgs = {
 };
 
 
+export type QuerySkillArgs = {
+  id: Scalars['UUID'];
+};
+
+
 export type QueryValidatePasswordResetTokenArgs = {
   passwordResetToken: Scalars['String'];
 };
@@ -4159,6 +4204,22 @@ export type SignedFile = {
   token: Scalars['String'];
 };
 
+export type Skill = {
+  __typename?: 'Skill';
+  applicationId?: Maybe<Scalars['UUID']>;
+  content: Scalars['String'];
+  createdAt: Scalars['DateTime'];
+  description?: Maybe<Scalars['String']>;
+  icon?: Maybe<Scalars['String']>;
+  id: Scalars['UUID'];
+  isActive: Scalars['Boolean'];
+  isCustom: Scalars['Boolean'];
+  label: Scalars['String'];
+  name: Scalars['String'];
+  standardId?: Maybe<Scalars['UUID']>;
+  updatedAt: Scalars['DateTime'];
+};
+
 export type StandaloneRichTextConfiguration = {
   __typename?: 'StandaloneRichTextConfiguration';
   body: RichTextV2Body;
@@ -4603,6 +4664,16 @@ export type UpdateServerlessFunctionInputUpdates = {
   timeoutSeconds?: InputMaybe<Scalars['Float']>;
 };
 
+export type UpdateSkillInput = {
+  content?: InputMaybe<Scalars['String']>;
+  description?: InputMaybe<Scalars['String']>;
+  icon?: InputMaybe<Scalars['String']>;
+  id: Scalars['UUID'];
+  isActive?: InputMaybe<Scalars['Boolean']>;
+  label?: InputMaybe<Scalars['String']>;
+  name?: InputMaybe<Scalars['String']>;
+};
+
 export type UpdateViewFieldInput = {
   /** The id of the view field to update */
   id: Scalars['UUID'];
@@ -5220,6 +5291,15 @@ export type WorkspaceUrlsAndId = {
 
 export type AgentFieldsFragment = { __typename?: 'Agent', id: string, name: string, label: string, description?: string | null, icon?: string | null, prompt: string, modelId: string, responseFormat?: any | null, roleId?: string | null, isCustom: boolean, modelConfiguration?: any | null, evaluationInputs: Array<string>, applicationId?: string | null, createdAt: string, updatedAt: string };
 
+export type SkillFieldsFragment = { __typename?: 'Skill', id: string, name: string, label: string, description?: string | null, icon?: string | null, content: string, isCustom: boolean, isActive: boolean, createdAt: string, updatedAt: string };
+
+export type ActivateSkillMutationVariables = Exact<{
+  id: Scalars['UUID'];
+}>;
+
+
+export type ActivateSkillMutation = { __typename?: 'Mutation', activateSkill: { __typename?: 'Skill', id: string, name: string, label: string, description?: string | null, icon?: string | null, content: string, isCustom: boolean, isActive: boolean, createdAt: string, updatedAt: string } };
+
 export type AssignRoleToAgentMutationVariables = Exact<{
   agentId: Scalars['UUID'];
   roleId: Scalars['UUID'];
@@ -5240,6 +5320,20 @@ export type CreateOneAgentMutationVariables = Exact<{
 
 export type CreateOneAgentMutation = { __typename?: 'Mutation', createOneAgent: { __typename?: 'Agent', id: string, name: string, label: string, description?: string | null, icon?: string | null, prompt: string, modelId: string, responseFormat?: any | null, roleId?: string | null, isCustom: boolean, modelConfiguration?: any | null, evaluationInputs: Array<string>, applicationId?: string | null, createdAt: string, updatedAt: string } };
 
+export type CreateSkillMutationVariables = Exact<{
+  input: CreateSkillInput;
+}>;
+
+
+export type CreateSkillMutation = { __typename?: 'Mutation', createSkill: { __typename?: 'Skill', id: string, name: string, label: string, description?: string | null, icon?: string | null, content: string, isCustom: boolean, isActive: boolean, createdAt: string, updatedAt: string } };
+
+export type DeactivateSkillMutationVariables = Exact<{
+  id: Scalars['UUID'];
+}>;
+
+
+export type DeactivateSkillMutation = { __typename?: 'Mutation', deactivateSkill: { __typename?: 'Skill', id: string, name: string, label: string, description?: string | null, icon?: string | null, content: string, isCustom: boolean, isActive: boolean, createdAt: string, updatedAt: string } };
+
 export type DeleteOneAgentMutationVariables = Exact<{
   input: AgentIdInput;
 }>;
@@ -5247,6 +5341,13 @@ export type DeleteOneAgentMutationVariables = Exact<{
 
 export type DeleteOneAgentMutation = { __typename?: 'Mutation', deleteOneAgent: { __typename?: 'Agent', id: string, name: string, label: string, description?: string | null, icon?: string | null, prompt: string, modelId: string, responseFormat?: any | null, roleId?: string | null, isCustom: boolean, modelConfiguration?: any | null, evaluationInputs: Array<string>, applicationId?: string | null, createdAt: string, updatedAt: string } };
 
+export type DeleteSkillMutationVariables = Exact<{
+  id: Scalars['UUID'];
+}>;
+
+
+export type DeleteSkillMutation = { __typename?: 'Mutation', deleteSkill: { __typename?: 'Skill', id: string, name: string, label: string, description?: string | null, icon?: string | null, content: string, isCustom: boolean, isActive: boolean, createdAt: string, updatedAt: string } };
+
 export type EvaluateAgentTurnMutationVariables = Exact<{
   turnId: Scalars['UUID'];
 }>;
@@ -5276,11 +5377,23 @@ export type UpdateOneAgentMutationVariables = Exact<{
 
 export type UpdateOneAgentMutation = { __typename?: 'Mutation', updateOneAgent: { __typename?: 'Agent', id: string, name: string, label: string, description?: string | null, icon?: string | null, prompt: string, modelId: string, responseFormat?: any | null, roleId?: string | null, isCustom: boolean, modelConfiguration?: any | null, evaluationInputs: Array<string>, applicationId?: string | null, createdAt: string, updatedAt: string } };
 
+export type UpdateSkillMutationVariables = Exact<{
+  input: UpdateSkillInput;
+}>;
+
+
+export type UpdateSkillMutation = { __typename?: 'Mutation', updateSkill: { __typename?: 'Skill', id: string, name: string, label: string, description?: string | null, icon?: string | null, content: string, isCustom: boolean, isActive: boolean, createdAt: string, updatedAt: string } };
+
 export type FindManyAgentsQueryVariables = Exact<{ [key: string]: never; }>;
 
 
 export type FindManyAgentsQuery = { __typename?: 'Query', findManyAgents: Array<{ __typename?: 'Agent', id: string, name: string, label: string, description?: string | null, icon?: string | null, prompt: string, modelId: string, responseFormat?: any | null, roleId?: string | null, isCustom: boolean, modelConfiguration?: any | null, evaluationInputs: Array<string>, applicationId?: string | null, createdAt: string, updatedAt: string }> };
 
+export type FindManySkillsQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type FindManySkillsQuery = { __typename?: 'Query', skills: Array<{ __typename?: 'Skill', id: string, name: string, label: string, description?: string | null, icon?: string | null, content: string, isCustom: boolean, isActive: boolean, createdAt: string, updatedAt: string }> };
+
 export type FindOneAgentQueryVariables = Exact<{
   id: Scalars['UUID'];
 }>;
@@ -5288,6 +5401,13 @@ export type FindOneAgentQueryVariables = Exact<{
 
 export type FindOneAgentQuery = { __typename?: 'Query', findOneAgent: { __typename?: 'Agent', id: string, name: string, label: string, description?: string | null, icon?: string | null, prompt: string, modelId: string, responseFormat?: any | null, roleId?: string | null, isCustom: boolean, modelConfiguration?: any | null, evaluationInputs: Array<string>, applicationId?: string | null, createdAt: string, updatedAt: string } };
 
+export type FindOneSkillQueryVariables = Exact<{
+  id: Scalars['UUID'];
+}>;
+
+
+export type FindOneSkillQuery = { __typename?: 'Query', skill?: { __typename?: 'Skill', id: string, name: string, label: string, description?: string | null, icon?: string | null, content: string, isCustom: boolean, isActive: boolean, createdAt: string, updatedAt: string } | null };
+
 export type GetAgentTurnsQueryVariables = Exact<{
   agentId: Scalars['UUID'];
 }>;
@@ -6758,6 +6878,20 @@ export type GetWorkspaceFromInviteHashQueryVariables = Exact<{
 
 export type GetWorkspaceFromInviteHashQuery = { __typename?: 'Query', findWorkspaceFromInviteHash: { __typename?: 'Workspace', id: string, displayName?: string | null, logo?: string | null, allowImpersonation: boolean } };
 
+export const SkillFieldsFragmentDoc = gql`
+    fragment SkillFields on Skill {
+  id
+  name
+  label
+  description
+  icon
+  content
+  isCustom
+  isActive
+  createdAt
+  updatedAt
+}
+    `;
 export const AgentFieldsFragmentDoc = gql`
     fragment AgentFields on Agent {
   id
@@ -7417,6 +7551,39 @@ export const WorkflowDiffFragmentFragmentDoc = gql`
   stepsDiff
 }
     `;
+export const ActivateSkillDocument = gql`
+    mutation ActivateSkill($id: UUID!) {
+  activateSkill(id: $id) {
+    ...SkillFields
+  }
+}
+    ${SkillFieldsFragmentDoc}`;
+export type ActivateSkillMutationFn = Apollo.MutationFunction<ActivateSkillMutation, ActivateSkillMutationVariables>;
+
+/**
+ * __useActivateSkillMutation__
+ *
+ * To run a mutation, you first call `useActivateSkillMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useActivateSkillMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [activateSkillMutation, { data, loading, error }] = useActivateSkillMutation({
+ *   variables: {
+ *      id: // value for 'id'
+ *   },
+ * });
+ */
+export function useActivateSkillMutation(baseOptions?: Apollo.MutationHookOptions<ActivateSkillMutation, ActivateSkillMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<ActivateSkillMutation, ActivateSkillMutationVariables>(ActivateSkillDocument, options);
+      }
+export type ActivateSkillMutationHookResult = ReturnType<typeof useActivateSkillMutation>;
+export type ActivateSkillMutationResult = Apollo.MutationResult<ActivateSkillMutation>;
+export type ActivateSkillMutationOptions = Apollo.BaseMutationOptions<ActivateSkillMutation, ActivateSkillMutationVariables>;
 export const AssignRoleToAgentDocument = gql`
     mutation AssignRoleToAgent($agentId: UUID!, $roleId: UUID!) {
   assignRoleToAgent(agentId: $agentId, roleId: $roleId)
@@ -7517,6 +7684,72 @@ export function useCreateOneAgentMutation(baseOptions?: Apollo.MutationHookOptio
 export type CreateOneAgentMutationHookResult = ReturnType<typeof useCreateOneAgentMutation>;
 export type CreateOneAgentMutationResult = Apollo.MutationResult<CreateOneAgentMutation>;
 export type CreateOneAgentMutationOptions = Apollo.BaseMutationOptions<CreateOneAgentMutation, CreateOneAgentMutationVariables>;
+export const CreateSkillDocument = gql`
+    mutation CreateSkill($input: CreateSkillInput!) {
+  createSkill(input: $input) {
+    ...SkillFields
+  }
+}
+    ${SkillFieldsFragmentDoc}`;
+export type CreateSkillMutationFn = Apollo.MutationFunction<CreateSkillMutation, CreateSkillMutationVariables>;
+
+/**
+ * __useCreateSkillMutation__
+ *
+ * To run a mutation, you first call `useCreateSkillMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useCreateSkillMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [createSkillMutation, { data, loading, error }] = useCreateSkillMutation({
+ *   variables: {
+ *      input: // value for 'input'
+ *   },
+ * });
+ */
+export function useCreateSkillMutation(baseOptions?: Apollo.MutationHookOptions<CreateSkillMutation, CreateSkillMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<CreateSkillMutation, CreateSkillMutationVariables>(CreateSkillDocument, options);
+      }
+export type CreateSkillMutationHookResult = ReturnType<typeof useCreateSkillMutation>;
+export type CreateSkillMutationResult = Apollo.MutationResult<CreateSkillMutation>;
+export type CreateSkillMutationOptions = Apollo.BaseMutationOptions<CreateSkillMutation, CreateSkillMutationVariables>;
+export const DeactivateSkillDocument = gql`
+    mutation DeactivateSkill($id: UUID!) {
+  deactivateSkill(id: $id) {
+    ...SkillFields
+  }
+}
+    ${SkillFieldsFragmentDoc}`;
+export type DeactivateSkillMutationFn = Apollo.MutationFunction<DeactivateSkillMutation, DeactivateSkillMutationVariables>;
+
+/**
+ * __useDeactivateSkillMutation__
+ *
+ * To run a mutation, you first call `useDeactivateSkillMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useDeactivateSkillMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [deactivateSkillMutation, { data, loading, error }] = useDeactivateSkillMutation({
+ *   variables: {
+ *      id: // value for 'id'
+ *   },
+ * });
+ */
+export function useDeactivateSkillMutation(baseOptions?: Apollo.MutationHookOptions<DeactivateSkillMutation, DeactivateSkillMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<DeactivateSkillMutation, DeactivateSkillMutationVariables>(DeactivateSkillDocument, options);
+      }
+export type DeactivateSkillMutationHookResult = ReturnType<typeof useDeactivateSkillMutation>;
+export type DeactivateSkillMutationResult = Apollo.MutationResult<DeactivateSkillMutation>;
+export type DeactivateSkillMutationOptions = Apollo.BaseMutationOptions<DeactivateSkillMutation, DeactivateSkillMutationVariables>;
 export const DeleteOneAgentDocument = gql`
     mutation DeleteOneAgent($input: AgentIdInput!) {
   deleteOneAgent(input: $input) {
@@ -7550,6 +7783,39 @@ export function useDeleteOneAgentMutation(baseOptions?: Apollo.MutationHookOptio
 export type DeleteOneAgentMutationHookResult = ReturnType<typeof useDeleteOneAgentMutation>;
 export type DeleteOneAgentMutationResult = Apollo.MutationResult<DeleteOneAgentMutation>;
 export type DeleteOneAgentMutationOptions = Apollo.BaseMutationOptions<DeleteOneAgentMutation, DeleteOneAgentMutationVariables>;
+export const DeleteSkillDocument = gql`
+    mutation DeleteSkill($id: UUID!) {
+  deleteSkill(id: $id) {
+    ...SkillFields
+  }
+}
+    ${SkillFieldsFragmentDoc}`;
+export type DeleteSkillMutationFn = Apollo.MutationFunction<DeleteSkillMutation, DeleteSkillMutationVariables>;
+
+/**
+ * __useDeleteSkillMutation__
+ *
+ * To run a mutation, you first call `useDeleteSkillMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useDeleteSkillMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [deleteSkillMutation, { data, loading, error }] = useDeleteSkillMutation({
+ *   variables: {
+ *      id: // value for 'id'
+ *   },
+ * });
+ */
+export function useDeleteSkillMutation(baseOptions?: Apollo.MutationHookOptions<DeleteSkillMutation, DeleteSkillMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<DeleteSkillMutation, DeleteSkillMutationVariables>(DeleteSkillDocument, options);
+      }
+export type DeleteSkillMutationHookResult = ReturnType<typeof useDeleteSkillMutation>;
+export type DeleteSkillMutationResult = Apollo.MutationResult<DeleteSkillMutation>;
+export type DeleteSkillMutationOptions = Apollo.BaseMutationOptions<DeleteSkillMutation, DeleteSkillMutationVariables>;
 export const EvaluateAgentTurnDocument = gql`
     mutation EvaluateAgentTurn($turnId: UUID!) {
   evaluateAgentTurn(turnId: $turnId) {
@@ -7694,6 +7960,39 @@ export function useUpdateOneAgentMutation(baseOptions?: Apollo.MutationHookOptio
 export type UpdateOneAgentMutationHookResult = ReturnType<typeof useUpdateOneAgentMutation>;
 export type UpdateOneAgentMutationResult = Apollo.MutationResult<UpdateOneAgentMutation>;
 export type UpdateOneAgentMutationOptions = Apollo.BaseMutationOptions<UpdateOneAgentMutation, UpdateOneAgentMutationVariables>;
+export const UpdateSkillDocument = gql`
+    mutation UpdateSkill($input: UpdateSkillInput!) {
+  updateSkill(input: $input) {
+    ...SkillFields
+  }
+}
+    ${SkillFieldsFragmentDoc}`;
+export type UpdateSkillMutationFn = Apollo.MutationFunction<UpdateSkillMutation, UpdateSkillMutationVariables>;
+
+/**
+ * __useUpdateSkillMutation__
+ *
+ * To run a mutation, you first call `useUpdateSkillMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useUpdateSkillMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [updateSkillMutation, { data, loading, error }] = useUpdateSkillMutation({
+ *   variables: {
+ *      input: // value for 'input'
+ *   },
+ * });
+ */
+export function useUpdateSkillMutation(baseOptions?: Apollo.MutationHookOptions<UpdateSkillMutation, UpdateSkillMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<UpdateSkillMutation, UpdateSkillMutationVariables>(UpdateSkillDocument, options);
+      }
+export type UpdateSkillMutationHookResult = ReturnType<typeof useUpdateSkillMutation>;
+export type UpdateSkillMutationResult = Apollo.MutationResult<UpdateSkillMutation>;
+export type UpdateSkillMutationOptions = Apollo.BaseMutationOptions<UpdateSkillMutation, UpdateSkillMutationVariables>;
 export const FindManyAgentsDocument = gql`
     query FindManyAgents {
   findManyAgents {
@@ -7728,6 +8027,40 @@ export function useFindManyAgentsLazyQuery(baseOptions?: Apollo.LazyQueryHookOpt
 export type FindManyAgentsQueryHookResult = ReturnType<typeof useFindManyAgentsQuery>;
 export type FindManyAgentsLazyQueryHookResult = ReturnType<typeof useFindManyAgentsLazyQuery>;
 export type FindManyAgentsQueryResult = Apollo.QueryResult<FindManyAgentsQuery, FindManyAgentsQueryVariables>;
+export const FindManySkillsDocument = gql`
+    query FindManySkills {
+  skills {
+    ...SkillFields
+  }
+}
+    ${SkillFieldsFragmentDoc}`;
+
+/**
+ * __useFindManySkillsQuery__
+ *
+ * To run a query within a React component, call `useFindManySkillsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useFindManySkillsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useFindManySkillsQuery({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useFindManySkillsQuery(baseOptions?: Apollo.QueryHookOptions<FindManySkillsQuery, FindManySkillsQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<FindManySkillsQuery, FindManySkillsQueryVariables>(FindManySkillsDocument, options);
+      }
+export function useFindManySkillsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<FindManySkillsQuery, FindManySkillsQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<FindManySkillsQuery, FindManySkillsQueryVariables>(FindManySkillsDocument, options);
+        }
+export type FindManySkillsQueryHookResult = ReturnType<typeof useFindManySkillsQuery>;
+export type FindManySkillsLazyQueryHookResult = ReturnType<typeof useFindManySkillsLazyQuery>;
+export type FindManySkillsQueryResult = Apollo.QueryResult<FindManySkillsQuery, FindManySkillsQueryVariables>;
 export const FindOneAgentDocument = gql`
     query FindOneAgent($id: UUID!) {
   findOneAgent(input: {id: $id}) {
@@ -7763,6 +8096,41 @@ export function useFindOneAgentLazyQuery(baseOptions?: Apollo.LazyQueryHookOptio
 export type FindOneAgentQueryHookResult = ReturnType<typeof useFindOneAgentQuery>;
 export type FindOneAgentLazyQueryHookResult = ReturnType<typeof useFindOneAgentLazyQuery>;
 export type FindOneAgentQueryResult = Apollo.QueryResult<FindOneAgentQuery, FindOneAgentQueryVariables>;
+export const FindOneSkillDocument = gql`
+    query FindOneSkill($id: UUID!) {
+  skill(id: $id) {
+    ...SkillFields
+  }
+}
+    ${SkillFieldsFragmentDoc}`;
+
+/**
+ * __useFindOneSkillQuery__
+ *
+ * To run a query within a React component, call `useFindOneSkillQuery` and pass it any options that fit your needs.
+ * When your component renders, `useFindOneSkillQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useFindOneSkillQuery({
+ *   variables: {
+ *      id: // value for 'id'
+ *   },
+ * });
+ */
+export function useFindOneSkillQuery(baseOptions: Apollo.QueryHookOptions<FindOneSkillQuery, FindOneSkillQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<FindOneSkillQuery, FindOneSkillQueryVariables>(FindOneSkillDocument, options);
+      }
+export function useFindOneSkillLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<FindOneSkillQuery, FindOneSkillQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<FindOneSkillQuery, FindOneSkillQueryVariables>(FindOneSkillDocument, options);
+        }
+export type FindOneSkillQueryHookResult = ReturnType<typeof useFindOneSkillQuery>;
+export type FindOneSkillLazyQueryHookResult = ReturnType<typeof useFindOneSkillLazyQuery>;
+export type FindOneSkillQueryResult = Apollo.QueryResult<FindOneSkillQuery, FindOneSkillQueryVariables>;
 export const GetAgentTurnsDocument = gql`
     query GetAgentTurns($agentId: UUID!) {
   agentTurns(agentId: $agentId) {
diff --git a/packages/twenty-front/src/generated/graphql.ts b/packages/twenty-front/src/generated/graphql.ts
index 25295430535..a7005a36c2e 100644
--- a/packages/twenty-front/src/generated/graphql.ts
+++ b/packages/twenty-front/src/generated/graphql.ts
@@ -3996,6 +3996,22 @@ export type SignedFile = {
   token: Scalars['String'];
 };
 
+export type Skill = {
+  __typename?: 'Skill';
+  applicationId?: Maybe<Scalars['UUID']>;
+  content: Scalars['String'];
+  createdAt: Scalars['DateTime'];
+  description?: Maybe<Scalars['String']>;
+  icon?: Maybe<Scalars['String']>;
+  id: Scalars['UUID'];
+  isActive: Scalars['Boolean'];
+  isCustom: Scalars['Boolean'];
+  label: Scalars['String'];
+  name: Scalars['String'];
+  standardId?: Maybe<Scalars['UUID']>;
+  updatedAt: Scalars['DateTime'];
+};
+
 export type StandaloneRichTextConfiguration = {
   __typename?: 'StandaloneRichTextConfiguration';
   body: RichTextV2Body;
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/hooks/useAdvancedTextEditor.ts b/packages/twenty-front/src/modules/advanced-text-editor/hooks/useAdvancedTextEditor.ts
index f4593038ad7..53f26b57835 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/hooks/useAdvancedTextEditor.ts
+++ b/packages/twenty-front/src/modules/advanced-text-editor/hooks/useAdvancedTextEditor.ts
@@ -17,9 +17,12 @@ import { Text } from '@tiptap/extension-text';
 import { Underline } from '@tiptap/extension-underline';
 import { Dropcursor, Placeholder, UndoRedo } from '@tiptap/extensions';
 import { type Editor, useEditor } from '@tiptap/react';
+import { marked } from 'marked';
 import { type DependencyList, useMemo } from 'react';
 import { isDefined } from 'twenty-shared/utils';
 
+export type AdvancedTextEditorContentType = 'json' | 'markdown';
+
 type UseAdvancedTextEditorProps = {
   placeholder: string | undefined;
   readonly: boolean | undefined;
@@ -30,6 +33,7 @@ type UseAdvancedTextEditorProps = {
   onImageUpload?: (file: File) => Promise<string>;
   onImageUploadError?: (error: Error, file: File) => void;
   enableSlashCommand?: boolean;
+  contentType?: AdvancedTextEditorContentType;
 };
 
 export const useAdvancedTextEditor = (
@@ -43,9 +47,12 @@ export const useAdvancedTextEditor = (
     onImageUpload,
     onImageUploadError,
     enableSlashCommand,
+    contentType = 'json',
   }: UseAdvancedTextEditorProps,
   dependencies?: DependencyList,
 ) => {
+  const isMarkdownMode = contentType === 'markdown';
+
   const extensions = useMemo(
     () => [
       Document,
@@ -87,12 +94,23 @@ export const useAdvancedTextEditor = (
     ],
   );
 
+  const getEditorContent = () => {
+    if (!isDefined(defaultValue)) {
+      return undefined;
+    }
+
+    if (isMarkdownMode) {
+      // Convert markdown to HTML, then TipTap will parse the HTML
+      return marked.parse(defaultValue, { async: false }) as string;
+    }
+
+    return getInitialAdvancedTextEditorContent(defaultValue);
+  };
+
   const editor = useEditor(
     {
       extensions,
-      content: isDefined(defaultValue)
-        ? getInitialAdvancedTextEditorContent(defaultValue)
-        : undefined,
+      content: getEditorContent(),
       editable: !readonly,
       onUpdate: ({ editor }) => {
         onUpdate(editor);
diff --git a/packages/twenty-front/src/modules/ai/graphql/fragments/skillFragment.ts b/packages/twenty-front/src/modules/ai/graphql/fragments/skillFragment.ts
new file mode 100644
index 00000000000..32976c77fc3
--- /dev/null
+++ b/packages/twenty-front/src/modules/ai/graphql/fragments/skillFragment.ts
@@ -0,0 +1,16 @@
+import { gql } from '@apollo/client';
+
+export const SKILL_FRAGMENT = gql`
+  fragment SkillFields on Skill {
+    id
+    name
+    label
+    description
+    icon
+    content
+    isCustom
+    isActive
+    createdAt
+    updatedAt
+  }
+`;
diff --git a/packages/twenty-front/src/modules/ai/graphql/mutations/activateSkill.ts b/packages/twenty-front/src/modules/ai/graphql/mutations/activateSkill.ts
new file mode 100644
index 00000000000..29877dc27cc
--- /dev/null
+++ b/packages/twenty-front/src/modules/ai/graphql/mutations/activateSkill.ts
@@ -0,0 +1,12 @@
+import { gql } from '@apollo/client';
+
+import { SKILL_FRAGMENT } from '@/ai/graphql/fragments/skillFragment';
+
+export const ACTIVATE_SKILL = gql`
+  ${SKILL_FRAGMENT}
+  mutation ActivateSkill($id: UUID!) {
+    activateSkill(id: $id) {
+      ...SkillFields
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/ai/graphql/mutations/createSkill.ts b/packages/twenty-front/src/modules/ai/graphql/mutations/createSkill.ts
new file mode 100644
index 00000000000..90f70dfa707
--- /dev/null
+++ b/packages/twenty-front/src/modules/ai/graphql/mutations/createSkill.ts
@@ -0,0 +1,12 @@
+import { gql } from '@apollo/client';
+
+import { SKILL_FRAGMENT } from '@/ai/graphql/fragments/skillFragment';
+
+export const CREATE_SKILL = gql`
+  ${SKILL_FRAGMENT}
+  mutation CreateSkill($input: CreateSkillInput!) {
+    createSkill(input: $input) {
+      ...SkillFields
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/ai/graphql/mutations/deactivateSkill.ts b/packages/twenty-front/src/modules/ai/graphql/mutations/deactivateSkill.ts
new file mode 100644
index 00000000000..f5611caa7c1
--- /dev/null
+++ b/packages/twenty-front/src/modules/ai/graphql/mutations/deactivateSkill.ts
@@ -0,0 +1,12 @@
+import { gql } from '@apollo/client';
+
+import { SKILL_FRAGMENT } from '@/ai/graphql/fragments/skillFragment';
+
+export const DEACTIVATE_SKILL = gql`
+  ${SKILL_FRAGMENT}
+  mutation DeactivateSkill($id: UUID!) {
+    deactivateSkill(id: $id) {
+      ...SkillFields
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/ai/graphql/mutations/deleteSkill.ts b/packages/twenty-front/src/modules/ai/graphql/mutations/deleteSkill.ts
new file mode 100644
index 00000000000..6936a72dd99
--- /dev/null
+++ b/packages/twenty-front/src/modules/ai/graphql/mutations/deleteSkill.ts
@@ -0,0 +1,12 @@
+import { gql } from '@apollo/client';
+
+import { SKILL_FRAGMENT } from '@/ai/graphql/fragments/skillFragment';
+
+export const DELETE_SKILL = gql`
+  ${SKILL_FRAGMENT}
+  mutation DeleteSkill($id: UUID!) {
+    deleteSkill(id: $id) {
+      ...SkillFields
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/ai/graphql/mutations/updateSkill.ts b/packages/twenty-front/src/modules/ai/graphql/mutations/updateSkill.ts
new file mode 100644
index 00000000000..580c88d7b16
--- /dev/null
+++ b/packages/twenty-front/src/modules/ai/graphql/mutations/updateSkill.ts
@@ -0,0 +1,12 @@
+import { gql } from '@apollo/client';
+
+import { SKILL_FRAGMENT } from '@/ai/graphql/fragments/skillFragment';
+
+export const UPDATE_SKILL = gql`
+  ${SKILL_FRAGMENT}
+  mutation UpdateSkill($input: UpdateSkillInput!) {
+    updateSkill(input: $input) {
+      ...SkillFields
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/ai/graphql/queries/findManySkills.ts b/packages/twenty-front/src/modules/ai/graphql/queries/findManySkills.ts
new file mode 100644
index 00000000000..9ae2855de72
--- /dev/null
+++ b/packages/twenty-front/src/modules/ai/graphql/queries/findManySkills.ts
@@ -0,0 +1,12 @@
+import { gql } from '@apollo/client';
+
+import { SKILL_FRAGMENT } from '@/ai/graphql/fragments/skillFragment';
+
+export const FIND_MANY_SKILLS = gql`
+  ${SKILL_FRAGMENT}
+  query FindManySkills {
+    skills {
+      ...SkillFields
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/ai/graphql/queries/findOneSkill.ts b/packages/twenty-front/src/modules/ai/graphql/queries/findOneSkill.ts
new file mode 100644
index 00000000000..5e52085013f
--- /dev/null
+++ b/packages/twenty-front/src/modules/ai/graphql/queries/findOneSkill.ts
@@ -0,0 +1,12 @@
+import { gql } from '@apollo/client';
+
+import { SKILL_FRAGMENT } from '@/ai/graphql/fragments/skillFragment';
+
+export const FIND_ONE_SKILL = gql`
+  ${SKILL_FRAGMENT}
+  query FindOneSkill($id: UUID!) {
+    skill(id: $id) {
+      ...SkillFields
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx
index 28f2557a70d..cadf50811d4 100644
--- a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx
+++ b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx
@@ -171,6 +171,12 @@ const SettingsAgentTurnDetail = lazy(() =>
   })),
 );
 
+const SettingsSkillForm = lazy(() =>
+  import('~/pages/settings/ai/SettingsSkillForm').then((module) => ({
+    default: module.SettingsSkillForm,
+  })),
+);
+
 const SettingsWorkspaceMembers = lazy(() =>
   import('~/pages/settings/members/SettingsWorkspaceMembers').then(
     (module) => ({
@@ -440,6 +446,14 @@ export const SettingsRoutes = ({ isAdminPageEnabled }: SettingsRoutesProps) => (
           path={SettingsPath.AIAgentTurnDetail}
           element={<SettingsAgentTurnDetail />}
         />
+        <Route
+          path={SettingsPath.AINewSkill}
+          element={<SettingsSkillForm mode="create" />}
+        />
+        <Route
+          path={SettingsPath.AISkillDetail}
+          element={<SettingsSkillForm mode="edit" />}
+        />
         <Route path={SettingsPath.Billing} element={<SettingsBilling />} />
         <Route path={SettingsPath.Domain} element={<SettingsDomain />} />
         <Route
diff --git a/packages/twenty-front/src/modules/metadata-error-handler/hooks/useMetadataErrorHandler.ts b/packages/twenty-front/src/modules/metadata-error-handler/hooks/useMetadataErrorHandler.ts
index 8ce8af7d3a0..e3c0a203a5c 100644
--- a/packages/twenty-front/src/modules/metadata-error-handler/hooks/useMetadataErrorHandler.ts
+++ b/packages/twenty-front/src/modules/metadata-error-handler/hooks/useMetadataErrorHandler.ts
@@ -26,6 +26,7 @@ export const useMetadataErrorHandler = () => {
     role: t`role`,
     roleTarget: t`role target`,
     agent: t`agent`,
+    skill: t`skill`,
     pageLayout: t`page layout`,
     pageLayoutTab: t`page layout tab`,
     pageLayoutWidget: t`page layout widget`,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormAdvancedTextFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormAdvancedTextFieldInput.tsx
index 7722e3ba0b5..cdf40c240ec 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormAdvancedTextFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormAdvancedTextFieldInput.tsx
@@ -1,5 +1,8 @@
 import { AdvancedTextEditor } from '@/advanced-text-editor/components/AdvancedTextEditor';
-import { useAdvancedTextEditor } from '@/advanced-text-editor/hooks/useAdvancedTextEditor';
+import {
+  type AdvancedTextEditorContentType,
+  useAdvancedTextEditor,
+} from '@/advanced-text-editor/hooks/useAdvancedTextEditor';
 import { FormFieldInputContainer } from '@/object-record/record-field/ui/form-types/components/FormFieldInputContainer';
 import { type VariablePickerComponent } from '@/object-record/record-field/ui/form-types/types/VariablePickerComponent';
 import { InputErrorHelper } from '@/ui/input/components/InputErrorHelper';
@@ -86,6 +89,7 @@ type FormAdvancedTextFieldInputProps = {
   fullScreenBreadcrumbs?: BreadcrumbProps['links'];
   minHeight: number;
   maxWidth: number;
+  contentType?: AdvancedTextEditorContentType;
 };
 
 export const FormAdvancedTextFieldInput = ({
@@ -103,6 +107,7 @@ export const FormAdvancedTextFieldInput = ({
   fullScreenBreadcrumbs,
   minHeight,
   maxWidth,
+  contentType = 'json',
 }: FormAdvancedTextFieldInputProps) => {
   const instanceId = useId();
   const isMobile = useIsMobile();
@@ -119,9 +124,15 @@ export const FormAdvancedTextFieldInput = ({
       placeholder: placeholder,
       readonly,
       defaultValue,
+      contentType,
       onUpdate: (editor) => {
-        const jsonContent = editor.getJSON();
-        onChange(JSON.stringify(jsonContent));
+        if (contentType === 'markdown') {
+          // For markdown mode, output the HTML which preserves formatting
+          onChange(editor.getHTML());
+        } else {
+          const jsonContent = editor.getJSON();
+          onChange(JSON.stringify(jsonContent));
+        }
       },
       onFocus: () => {
         pushFocusItemToFocusStack({
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx
index 41ff414c37e..35a15133a47 100644
--- a/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx
@@ -1,82 +1,17 @@
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
-import { TabList } from '@/ui/layout/tab-list/components/TabList';
-import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';
-import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue';
 import { SettingsPath } from 'twenty-shared/types';
 import { getSettingsPath } from 'twenty-shared/utils';
-import {
-  IconPlus,
-  IconRobot,
-  IconServer,
-  IconSettings,
-} from 'twenty-ui/display';
-import { Button } from 'twenty-ui/input';
-import { UndecoratedLink } from 'twenty-ui/navigation';
 
 import { t } from '@lingui/core/macro';
-import { SettingsAIAgentsTable } from './components/SettingsAIAgentsTable';
 import { SettingsAIMCP } from './components/SettingsAIMCP';
 import { SettingsAIRouterSettings } from './components/SettingsAIRouterSettings';
-
-const SETTINGS_AI_TABS_ID = 'settings-ai-tabs-id';
-
-const SETTINGS_AI_TABS = {
-  AGENTS: 'agents',
-  SETTINGS: 'settings',
-  MCP: 'mcp',
-};
+import { SettingsSkillsTable } from './components/SettingsSkillsTable';
 
 export const SettingsAI = () => {
-  const activeTabId = useRecoilComponentValue(
-    activeTabIdComponentState,
-    SETTINGS_AI_TABS_ID,
-  );
-
-  const tabs = [
-    {
-      id: SETTINGS_AI_TABS.AGENTS,
-      title: t`Agents`,
-      Icon: IconRobot,
-    },
-    {
-      id: SETTINGS_AI_TABS.MCP,
-      title: t`MCP`,
-      Icon: IconServer,
-    },
-    {
-      id: SETTINGS_AI_TABS.SETTINGS,
-      title: t`Settings`,
-      Icon: IconSettings,
-    },
-  ];
-
-  const renderActiveTabContent = () => {
-    switch (activeTabId) {
-      case SETTINGS_AI_TABS.AGENTS:
-        return <SettingsAIAgentsTable />;
-      case SETTINGS_AI_TABS.SETTINGS:
-        return <SettingsAIRouterSettings />;
-      case SETTINGS_AI_TABS.MCP:
-        return <SettingsAIMCP />;
-    }
-  };
-
   return (
     <SubMenuTopBarContainer
       title={t`AI`}
-      actionButton={
-        activeTabId === SETTINGS_AI_TABS.AGENTS ? (
-          <UndecoratedLink to={getSettingsPath(SettingsPath.AINewAgent)}>
-            <Button
-              Icon={IconPlus}
-              title={t`New Agent`}
-              accent="blue"
-              size="small"
-            />
-          </UndecoratedLink>
-        ) : undefined
-      }
       links={[
         {
           children: t`Workspace`,
@@ -86,8 +21,9 @@ export const SettingsAI = () => {
       ]}
     >
       <SettingsPageContainer>
-        <TabList tabs={tabs} componentInstanceId={SETTINGS_AI_TABS_ID} />
-        {renderActiveTabContent()}
+        <SettingsAIRouterSettings />
+        <SettingsSkillsTable />
+        <SettingsAIMCP />
       </SettingsPageContainer>
     </SubMenuTopBarContainer>
   );
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsSkillForm.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsSkillForm.tsx
new file mode 100644
index 00000000000..93762d74a3f
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsSkillForm.tsx
@@ -0,0 +1,600 @@
+import { ApolloError } from '@apollo/client';
+import styled from '@emotion/styled';
+import { useParams } from 'react-router-dom';
+import { useDebouncedCallback } from 'use-debounce';
+
+import { FormAdvancedTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormAdvancedTextFieldInput';
+import { AdvancedSettingsWrapper } from '@/settings/components/AdvancedSettingsWrapper';
+import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
+import { SettingsOptionCardContentToggle } from '@/settings/components/SettingsOptions/SettingsOptionCardContentToggle';
+import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { IconPicker } from '@/ui/input/components/IconPicker';
+import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
+import { TextArea } from '@/ui/input/components/TextArea';
+import { TitleInput } from '@/ui/input/components/TitleInput';
+import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
+import { useTheme } from '@emotion/react';
+import { t } from '@lingui/core/macro';
+import { AppPath, SettingsPath } from 'twenty-shared/types';
+import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import {
+  AppTooltip,
+  H2Title,
+  IconArchive,
+  IconArchiveOff,
+  IconInfoCircle,
+  IconRefresh,
+  IconTrash,
+  TooltipDelay,
+} from 'twenty-ui/display';
+import { Button } from 'twenty-ui/input';
+import { Card, Section } from 'twenty-ui/layout';
+import {
+  useActivateSkillMutation,
+  useCreateSkillMutation,
+  useDeactivateSkillMutation,
+  useDeleteSkillMutation,
+  useFindOneSkillQuery,
+  useUpdateSkillMutation,
+  type FindOneSkillQuery,
+} from '~/generated-metadata/graphql';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
+import { computeMetadataNameFromLabel } from '~/pages/settings/data-model/utils/computeMetadataNameFromLabel';
+
+import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
+import { useModal } from '@/ui/layout/modal/hooks/useModal';
+import { useEffect, useState } from 'react';
+import Skeleton from 'react-loading-skeleton';
+import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
+
+const StyledFormContainer = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: ${({ theme }) => theme.spacing(4)};
+`;
+
+const StyledIconNameRow = styled.div`
+  align-items: flex-start;
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(2)};
+`;
+
+const StyledNameContainer = styled.div`
+  flex: 1;
+`;
+
+const StyledAdvancedSettingsOuterContainer = styled.div`
+  padding-top: ${({ theme }) => theme.spacing(4)};
+`;
+
+const StyledAdvancedSettingsContainer = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: ${({ theme }) => theme.spacing(4)};
+  width: 100%;
+`;
+
+const StyledHeaderTitle = styled.div`
+  color: ${({ theme }) => theme.font.color.primary};
+  font-weight: ${({ theme }) => theme.font.weight.semiBold};
+  font-size: ${({ theme }) => theme.font.size.lg};
+  width: fit-content;
+  max-width: 420px;
+  & > input:disabled {
+    color: ${({ theme }) => theme.font.color.primary};
+  }
+`;
+
+const StyledDangerButtonsContainer = styled.div`
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(2)};
+`;
+
+type SkillFormValues = {
+  name: string;
+  label: string;
+  description: string;
+  content: string;
+  icon: string;
+  isLabelSyncedWithName: boolean;
+};
+
+const DELETE_SKILL_MODAL_ID = 'delete-skill-modal';
+
+export const SettingsSkillForm = ({ mode }: { mode: 'create' | 'edit' }) => {
+  const { skillId = '' } = useParams<{ skillId: string }>();
+  const navigate = useNavigateSettings();
+  const navigateApp = useNavigateApp();
+  const { enqueueErrorSnackBar } = useSnackBar();
+  const theme = useTheme();
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [isReadonlyMode, setIsReadonlyMode] = useState(false);
+  const [originalFormValues, setOriginalFormValues] =
+    useState<SkillFormValues | null>(null);
+  const { openModal, closeModal } = useModal();
+
+  const isEditMode = mode === 'edit';
+  const isCreateMode = mode === 'create';
+
+  const [formValues, setFormValues] = useState<SkillFormValues>({
+    name: '',
+    label: '',
+    description: '',
+    content: '',
+    icon: 'IconSparkles',
+    isLabelSyncedWithName: true,
+  });
+
+  const { data, loading } = useFindOneSkillQuery({
+    variables: { id: skillId },
+    skip: isCreateMode || !skillId,
+    onCompleted: (data: FindOneSkillQuery) => {
+      const skill = data?.skill;
+      if (isDefined(skill)) {
+        if (!skill.isCustom) {
+          setIsReadonlyMode(true);
+        }
+        const computedNameFromLabel = computeMetadataNameFromLabel(skill.label);
+        const isLabelSyncedWithName = skill.name === computedNameFromLabel;
+
+        const initialValues: SkillFormValues = {
+          name: skill.name,
+          label: skill.label,
+          description: skill.description ?? '',
+          content: skill.content,
+          icon: skill.icon ?? 'IconSparkles',
+          isLabelSyncedWithName,
+        };
+        setFormValues(initialValues);
+        setOriginalFormValues(initialValues);
+      } else {
+        enqueueErrorSnackBar({
+          message: t`Skill not found`,
+        });
+        navigateApp(AppPath.NotFound);
+      }
+    },
+    onError: (error: ApolloError) => {
+      enqueueErrorSnackBar({
+        apolloError: error,
+      });
+      navigateApp(AppPath.NotFound);
+    },
+  });
+
+  const [createSkill] = useCreateSkillMutation();
+  const [updateSkill] = useUpdateSkillMutation();
+  const [deleteSkill] = useDeleteSkillMutation();
+  const [activateSkill] = useActivateSkillMutation();
+  const [deactivateSkill] = useDeactivateSkillMutation();
+
+  const skill = data?.skill;
+
+  const handleFieldChange = <K extends keyof SkillFormValues>(
+    fieldName: K,
+    value: SkillFormValues[K],
+  ) => {
+    setFormValues((prev) => {
+      const newValues = { ...prev, [fieldName]: value };
+
+      if (fieldName === 'label' && prev.isLabelSyncedWithName) {
+        newValues.name = computeMetadataNameFromLabel(value as string);
+      }
+
+      if (fieldName === 'isLabelSyncedWithName' && value === true) {
+        newValues.name = computeMetadataNameFromLabel(prev.label);
+      }
+
+      return newValues;
+    });
+  };
+
+  const validateForm = (): boolean => {
+    return (
+      formValues.name.trim().length > 0 &&
+      formValues.label.trim().length > 0 &&
+      formValues.content.trim().length > 0
+    );
+  };
+
+  const autoSave = useDebouncedCallback(async () => {
+    if (
+      isCreateMode ||
+      isReadonlyMode ||
+      !validateForm() ||
+      isSubmitting ||
+      !skill
+    ) {
+      return;
+    }
+
+    const hasChanges =
+      originalFormValues && !isDeeplyEqual(formValues, originalFormValues);
+
+    if (!hasChanges) {
+      return;
+    }
+
+    setIsSubmitting(true);
+
+    try {
+      await updateSkill({
+        variables: {
+          input: {
+            id: skill.id,
+            name: formValues.name,
+            label: formValues.label,
+            description: formValues.description || undefined,
+            content: formValues.content,
+            icon: formValues.icon || undefined,
+          },
+        },
+      });
+
+      setOriginalFormValues({ ...formValues });
+    } catch (error) {
+      enqueueErrorSnackBar({
+        apolloError: error instanceof ApolloError ? error : undefined,
+      });
+    } finally {
+      setIsSubmitting(false);
+    }
+  }, 1_000);
+
+  useEffect(() => {
+    if (isEditMode && !loading && isDefined(originalFormValues)) {
+      autoSave();
+    }
+  }, [formValues, isEditMode, loading, originalFormValues, autoSave]);
+
+  useEffect(() => {
+    return () => {
+      autoSave.flush();
+    };
+  }, [autoSave]);
+
+  if (!isCreateMode && !loading && !skill) {
+    return null;
+  }
+
+  const canSave = !isReadonlyMode && validateForm() && !isSubmitting;
+
+  const handleSave = async () => {
+    if (isReadonlyMode || !validateForm()) {
+      return;
+    }
+
+    setIsSubmitting(true);
+
+    try {
+      if (isCreateMode) {
+        await createSkill({
+          variables: {
+            input: {
+              name: formValues.name,
+              label: formValues.label,
+              description: formValues.description || undefined,
+              content: formValues.content,
+              icon: formValues.icon || undefined,
+            },
+          },
+        });
+        navigate(SettingsPath.AI);
+        return;
+      }
+
+      if (!skill) {
+        return;
+      }
+
+      await updateSkill({
+        variables: {
+          input: {
+            id: skill.id,
+            name: formValues.name,
+            label: formValues.label,
+            description: formValues.description || undefined,
+            content: formValues.content,
+            icon: formValues.icon || undefined,
+          },
+        },
+      });
+
+      navigate(SettingsPath.AI);
+    } catch (error) {
+      enqueueErrorSnackBar({
+        apolloError: error instanceof ApolloError ? error : undefined,
+      });
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  const handleDelete = async () => {
+    if (!skill) return;
+
+    setIsSubmitting(true);
+    try {
+      await deleteSkill({
+        variables: { id: skill.id },
+      });
+      closeModal(DELETE_SKILL_MODAL_ID);
+      navigate(SettingsPath.AI);
+    } catch (error) {
+      enqueueErrorSnackBar({
+        apolloError: error instanceof ApolloError ? error : undefined,
+      });
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  const handleDeactivate = async () => {
+    if (!skill) return;
+
+    setIsSubmitting(true);
+    try {
+      await deactivateSkill({
+        variables: { id: skill.id },
+      });
+      navigate(SettingsPath.AI);
+    } catch (error) {
+      enqueueErrorSnackBar({
+        apolloError: error instanceof ApolloError ? error : undefined,
+      });
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  const handleActivate = async () => {
+    if (!skill) return;
+
+    setIsSubmitting(true);
+    try {
+      await activateSkill({
+        variables: { id: skill.id },
+      });
+      navigate(SettingsPath.AI);
+    } catch (error) {
+      enqueueErrorSnackBar({
+        apolloError: error instanceof ApolloError ? error : undefined,
+      });
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  const handleCancel = () => {
+    setFormValues({
+      name: '',
+      label: '',
+      description: '',
+      content: '',
+      icon: 'IconSparkles',
+      isLabelSyncedWithName: true,
+    });
+    navigate(SettingsPath.AI);
+  };
+
+  const breadcrumbText = !isCreateMode
+    ? loading
+      ? t`Skill`
+      : skill?.label
+    : t`New Skill`;
+
+  const isNameEditEnabled =
+    !isReadonlyMode && !formValues.isLabelSyncedWithName;
+
+  const apiNameTooltipText = formValues.isLabelSyncedWithName
+    ? t`Deactivate "Synchronize Label and API Name" to set a custom API name`
+    : t`Input must be in camel case and cannot start with a number`;
+
+  const renderTitle = () => {
+    if (isCreateMode) {
+      return t`New Skill`;
+    }
+
+    if (loading === true) {
+      return t`Skill`;
+    }
+
+    return (
+      <StyledHeaderTitle>
+        <TitleInput
+          instanceId="skill-label-input"
+          disabled={isReadonlyMode}
+          sizeVariant="md"
+          value={formValues.label}
+          onChange={(value) => handleFieldChange('label', value)}
+          placeholder={t`Skill name`}
+        />
+      </StyledHeaderTitle>
+    );
+  };
+
+  return (
+    <SubMenuTopBarContainer
+      title={renderTitle()}
+      actionButton={
+        isCreateMode ? (
+          <SaveAndCancelButtons
+            onSave={handleSave}
+            onCancel={handleCancel}
+            isSaveDisabled={!canSave}
+            isLoading={isSubmitting}
+            isCancelDisabled={isSubmitting}
+          />
+        ) : undefined
+      }
+      links={[
+        {
+          children: t`Workspace`,
+          href: getSettingsPath(SettingsPath.Workspace),
+        },
+        { children: t`AI`, href: getSettingsPath(SettingsPath.AI) },
+        { children: breadcrumbText },
+      ]}
+    >
+      <SettingsPageContainer>
+        {isEditMode && loading ? (
+          <Section>
+            <Skeleton height={400} borderRadius={4} />
+          </Section>
+        ) : (
+          <>
+            <Section>
+              <H2Title
+                title={t`About`}
+                description={t`Define the name and instructions for this skill`}
+              />
+              <StyledFormContainer>
+                <StyledIconNameRow>
+                  <IconPicker
+                    selectedIconKey={formValues.icon || 'IconSparkles'}
+                    onChange={({ iconKey }) =>
+                      handleFieldChange('icon', iconKey)
+                    }
+                    disabled={isReadonlyMode}
+                  />
+                  <StyledNameContainer>
+                    <SettingsTextInput
+                      instanceId="skill-label-input"
+                      placeholder={t`Skill name`}
+                      value={formValues.label}
+                      onChange={(value) => handleFieldChange('label', value)}
+                      disabled={isReadonlyMode}
+                      fullWidth
+                    />
+                  </StyledNameContainer>
+                </StyledIconNameRow>
+
+                <TextArea
+                  textAreaId="skill-description-textarea"
+                  placeholder={t`Write a description`}
+                  minRows={3}
+                  value={formValues.description}
+                  onChange={(value) =>
+                    handleFieldChange('description', value ?? '')
+                  }
+                  disabled={isReadonlyMode}
+                />
+
+                <FormAdvancedTextFieldInput
+                  key={originalFormValues?.content ?? 'loading'}
+                  label={t`Instructions`}
+                  readonly={isReadonlyMode}
+                  defaultValue={formValues.content}
+                  contentType="markdown"
+                  onChange={(content: string) =>
+                    handleFieldChange('content', content)
+                  }
+                  enableFullScreen={true}
+                  fullScreenBreadcrumbs={[
+                    {
+                      children: formValues.label || t`Skill`,
+                      href: '#',
+                    },
+                    {
+                      children: t`Instructions Editor`,
+                    },
+                  ]}
+                  minHeight={300}
+                  maxWidth={700}
+                />
+
+                <AdvancedSettingsWrapper hideDot>
+                  <StyledAdvancedSettingsOuterContainer>
+                    <StyledAdvancedSettingsContainer>
+                      <SettingsTextInput
+                        instanceId="skill-api-name"
+                        label={t`API Name`}
+                        placeholder={t`mySkill`}
+                        value={formValues.name}
+                        onChange={(value) => handleFieldChange('name', value)}
+                        disabled={!isNameEditEnabled}
+                        fullWidth
+                        RightIcon={() =>
+                          apiNameTooltipText && (
+                            <>
+                              <IconInfoCircle
+                                id="info-circle-id-skill-name"
+                                size={theme.icon.size.md}
+                                color={theme.font.color.tertiary}
+                                style={{ outline: 'none' }}
+                              />
+                              <AppTooltip
+                                anchorSelect="#info-circle-id-skill-name"
+                                content={apiNameTooltipText}
+                                offset={5}
+                                noArrow
+                                place="bottom"
+                                positionStrategy="fixed"
+                                delay={TooltipDelay.shortDelay}
+                              />
+                            </>
+                          )
+                        }
+                      />
+                      <Card rounded>
+                        <SettingsOptionCardContentToggle
+                          Icon={IconRefresh}
+                          title={t`Synchronize Label and API Name`}
+                          description={t`Should changing the label also change the API name?`}
+                          checked={formValues.isLabelSyncedWithName}
+                          disabled={isReadonlyMode}
+                          advancedMode
+                          onChange={(value) =>
+                            handleFieldChange('isLabelSyncedWithName', value)
+                          }
+                        />
+                      </Card>
+                    </StyledAdvancedSettingsContainer>
+                  </StyledAdvancedSettingsOuterContainer>
+                </AdvancedSettingsWrapper>
+              </StyledFormContainer>
+            </Section>
+
+            {skill && (
+              <Section>
+                <H2Title
+                  title={t`Danger zone`}
+                  description={t`Deactivate or delete this skill`}
+                />
+                <StyledDangerButtonsContainer>
+                  <Button
+                    Icon={skill.isActive ? IconArchive : IconArchiveOff}
+                    title={skill.isActive ? t`Deactivate` : t`Activate`}
+                    size="small"
+                    onClick={skill.isActive ? handleDeactivate : handleActivate}
+                  />
+                  {skill.isCustom && (
+                    <Button
+                      Icon={IconTrash}
+                      title={t`Delete`}
+                      size="small"
+                      accent="danger"
+                      variant="secondary"
+                      onClick={() => openModal(DELETE_SKILL_MODAL_ID)}
+                    />
+                  )}
+                </StyledDangerButtonsContainer>
+              </Section>
+            )}
+          </>
+        )}
+      </SettingsPageContainer>
+
+      <ConfirmationModal
+        modalId={DELETE_SKILL_MODAL_ID}
+        title={t`Delete Skill`}
+        subtitle={t`Are you sure you want to delete this skill? This action cannot be undone.`}
+        onConfirmClick={handleDelete}
+        confirmButtonText={t`Delete`}
+        loading={isSubmitting}
+      />
+    </SubMenuTopBarContainer>
+  );
+};
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAIMCP.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAIMCP.tsx
index 50ba34b849d..e8c40fa5653 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAIMCP.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAIMCP.tsx
@@ -1,5 +1,4 @@
 import { Select } from '@/ui/input/components/Select';
-import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { Trans, useLingui } from '@lingui/react/macro';
 import { useState } from 'react';
@@ -20,12 +19,13 @@ const StyledWrapper = styled.div`
   border-radius: ${({ theme }) => theme.border.radius.md};
 `;
 
-const StyledImage = styled.img`
-  border-bottom: 1px solid ${({ theme }) => theme.border.color.light};
-  height: 100%;
-  object-fit: cover;
-  width: 100%;
-`;
+// TODO: Re-enable when MCP image is ready
+// const StyledImage = styled.img`
+//   border-bottom: 1px solid ${({ theme }) => theme.border.color.light};
+//   height: 100%;
+//   object-fit: cover;
+//   width: 100%;
+// `;
 
 const StyledSchemaSelector = styled.div`
   align-items: center;
@@ -62,7 +62,6 @@ const StyledEditorContainer = styled.div`
 `;
 
 export const SettingsAIMCP = () => {
-  const theme = useTheme();
   const { t } = useLingui();
   const { copyToClipboard } = useCopyToClipboard();
 
@@ -117,9 +116,6 @@ export const SettingsAIMCP = () => {
         description={t`Access your workspace data from your favorite MCP client like Claude Desktop, Windsurf or Cursor.`}
       />
       <StyledWrapper>
-        <StyledImage
-          src={`/images/integrations/integration-mcp-cover-${theme.name}.svg`}
-        />
         <StyledSchemaSelector>
           <Select
             dropdownId="mcp-schema-selector"
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillInactiveMenuDropDown.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillInactiveMenuDropDown.tsx
new file mode 100644
index 00000000000..777e74ce8bd
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillInactiveMenuDropDown.tsx
@@ -0,0 +1,69 @@
+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
+import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
+import { t } from '@lingui/core/macro';
+import { IconArchiveOff, IconDotsVertical, IconTrash } from 'twenty-ui/display';
+import { LightIconButton } from 'twenty-ui/input';
+import { MenuItem } from 'twenty-ui/navigation';
+
+type SettingsSkillInactiveMenuDropDownProps = {
+  isCustomSkill: boolean;
+  onActivate: () => void;
+  onDelete: () => void;
+  skillId: string;
+};
+
+export const SettingsSkillInactiveMenuDropDown = ({
+  onActivate,
+  skillId,
+  onDelete,
+  isCustomSkill,
+}: SettingsSkillInactiveMenuDropDownProps) => {
+  const dropdownId = `${skillId}-settings-skill-inactive-menu-dropdown`;
+
+  const { closeDropdown } = useCloseDropdown();
+
+  const handleActivate = () => {
+    onActivate();
+    closeDropdown(dropdownId);
+  };
+
+  const handleDelete = () => {
+    onDelete();
+    closeDropdown(dropdownId);
+  };
+
+  return (
+    <Dropdown
+      dropdownId={dropdownId}
+      clickableComponent={
+        <LightIconButton
+          aria-label={t`Inactive Skill Options`}
+          Icon={IconDotsVertical}
+          accent="tertiary"
+        />
+      }
+      dropdownComponents={
+        <DropdownContent widthInPixels={GenericDropdownContentWidth.Narrow}>
+          <DropdownMenuItemsContainer>
+            <MenuItem
+              text={t`Activate`}
+              LeftIcon={IconArchiveOff}
+              onClick={handleActivate}
+            />
+            {isCustomSkill && (
+              <MenuItem
+                text={t`Delete`}
+                LeftIcon={IconTrash}
+                accent="danger"
+                onClick={handleDelete}
+              />
+            )}
+          </DropdownMenuItemsContainer>
+        </DropdownContent>
+      }
+    />
+  );
+};
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillTableRow.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillTableRow.tsx
new file mode 100644
index 00000000000..5565ef68130
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillTableRow.tsx
@@ -0,0 +1,62 @@
+import styled from '@emotion/styled';
+import { type ReactNode } from 'react';
+
+import { SettingsItemTypeTag } from '@/settings/components/SettingsItemTypeTag';
+import { TableCell } from '@/ui/layout/table/components/TableCell';
+import { TableRow } from '@/ui/layout/table/components/TableRow';
+import { useIcons, OverflowingTextWithTooltip } from 'twenty-ui/display';
+
+import { type Skill } from '~/generated-metadata/graphql';
+
+export type SettingsSkillTableRowProps = {
+  skill: Skill;
+  action?: ReactNode;
+  link?: string;
+};
+
+export const StyledSkillTableRow = styled(TableRow)<{ isActive?: boolean }>`
+  grid-template-columns: 1fr 120px 36px;
+  opacity: ${({ isActive = true }) => (isActive ? 1 : 0.5)};
+`;
+
+const StyledNameTableCell = styled(TableCell)`
+  color: ${({ theme }) => theme.font.color.primary};
+  gap: ${({ theme }) => theme.spacing(2)};
+  min-width: 0;
+  overflow: hidden;
+`;
+
+const StyledIconContainer = styled.div`
+  align-items: center;
+  display: flex;
+  flex-shrink: 0;
+`;
+
+const StyledActionTableCell = styled(TableCell)`
+  justify-content: flex-end;
+  padding-right: ${({ theme }) => theme.spacing(2)};
+`;
+
+export const SettingsSkillTableRow = ({
+  skill,
+  action,
+  link,
+}: SettingsSkillTableRowProps) => {
+  const { getIcon } = useIcons();
+  const Icon = getIcon(skill.icon ?? 'IconSparkles');
+
+  return (
+    <StyledSkillTableRow key={skill.id} to={link} isActive={skill.isActive}>
+      <StyledNameTableCell>
+        <StyledIconContainer>
+          <Icon size={16} />
+        </StyledIconContainer>
+        <OverflowingTextWithTooltip text={skill.label} />
+      </StyledNameTableCell>
+      <TableCell>
+        <SettingsItemTypeTag item={skill} />
+      </TableCell>
+      <StyledActionTableCell>{action}</StyledActionTableCell>
+    </StyledSkillTableRow>
+  );
+};
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillsTable.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillsTable.tsx
new file mode 100644
index 00000000000..898ddb57041
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillsTable.tsx
@@ -0,0 +1,227 @@
+import styled from '@emotion/styled';
+import { useLingui } from '@lingui/react/macro';
+import { useMemo, useState } from 'react';
+import Skeleton from 'react-loading-skeleton';
+
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { SortableTableHeader } from '@/ui/layout/table/components/SortableTableHeader';
+import { Table } from '@/ui/layout/table/components/Table';
+import { TableHeader } from '@/ui/layout/table/components/TableHeader';
+import { useSortedArray } from '@/ui/layout/table/hooks/useSortedArray';
+import { useTheme } from '@emotion/react';
+import { SettingsPath } from 'twenty-shared/types';
+import { getSettingsPath } from 'twenty-shared/utils';
+import {
+  H2Title,
+  IconArchive,
+  IconChevronRight,
+  IconFilterCog,
+  IconPlus,
+  IconSearch,
+} from 'twenty-ui/display';
+import { Button, LightIconButton } from 'twenty-ui/input';
+import { Section } from 'twenty-ui/layout';
+import { MenuItemToggle, UndecoratedLink } from 'twenty-ui/navigation';
+
+import {
+  useActivateSkillMutation,
+  useDeleteSkillMutation,
+  useFindManySkillsQuery,
+} from '~/generated-metadata/graphql';
+import { SettingsSkillInactiveMenuDropDown } from '~/pages/settings/ai/components/SettingsSkillInactiveMenuDropDown';
+import { SETTINGS_SKILL_TABLE_METADATA } from '~/pages/settings/ai/constants/SettingsSkillTableMetadata';
+import { normalizeSearchText } from '~/utils/normalizeSearchText';
+import {
+  SettingsSkillTableRow,
+  StyledSkillTableRow,
+} from './SettingsSkillTableRow';
+
+const StyledSearchContainer = styled.div`
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(2)};
+  margin-bottom: ${({ theme }) => theme.spacing(2)};
+  width: 100%;
+`;
+
+const StyledSearchInput = styled(SettingsTextInput)`
+  flex: 1;
+`;
+
+const StyledTable = styled(Table)`
+  margin-top: ${({ theme }) => theme.spacing(3)};
+`;
+
+const StyledTableHeaderRow = styled(StyledSkillTableRow)`
+  margin-bottom: ${({ theme }) => theme.spacing(2)};
+`;
+
+const StyledHeaderContainer = styled.div`
+  align-items: center;
+  display: flex;
+  justify-content: space-between;
+`;
+
+export const SettingsSkillsTable = () => {
+  const { data, loading, refetch } = useFindManySkillsQuery();
+  const [activateSkill] = useActivateSkillMutation();
+  const [deleteSkill] = useDeleteSkillMutation();
+
+  const { t } = useLingui();
+  const theme = useTheme();
+  const { enqueueSuccessSnackBar, enqueueErrorSnackBar } = useSnackBar();
+  const [searchTerm, setSearchTerm] = useState('');
+  const [showDeactivated, setShowDeactivated] = useState(true);
+
+  const skills = data?.skills ?? [];
+
+  const sortedSkills = useSortedArray(skills, SETTINGS_SKILL_TABLE_METADATA);
+
+  const filteredSkills = useMemo(
+    () =>
+      sortedSkills.filter((skill) => {
+        const searchNormalized = normalizeSearchText(searchTerm);
+        const matchesSearch =
+          normalizeSearchText(skill.name).includes(searchNormalized) ||
+          normalizeSearchText(skill.label).includes(searchNormalized);
+
+        if (!matchesSearch) {
+          return false;
+        }
+
+        if (!skill.isActive && !showDeactivated) {
+          return false;
+        }
+
+        return true;
+      }),
+    [sortedSkills, searchTerm, showDeactivated],
+  );
+
+  const showSkeleton = loading && skills.length === 0;
+
+  const handleActivate = async (skillId: string) => {
+    try {
+      await activateSkill({ variables: { id: skillId } });
+      enqueueSuccessSnackBar({ message: t`Skill activated` });
+      refetch();
+    } catch {
+      enqueueErrorSnackBar({ message: t`Failed to activate skill` });
+    }
+  };
+
+  const handleDelete = async (skillId: string) => {
+    try {
+      await deleteSkill({ variables: { id: skillId } });
+      enqueueSuccessSnackBar({ message: t`Skill deleted` });
+      refetch();
+    } catch {
+      enqueueErrorSnackBar({ message: t`Failed to delete skill` });
+    }
+  };
+
+  return (
+    <Section>
+      <StyledHeaderContainer>
+        <H2Title
+          title={t`Skills`}
+          description={t`Skills available in the chat`}
+        />
+        <UndecoratedLink to={getSettingsPath(SettingsPath.AINewSkill)}>
+          <Button
+            Icon={IconPlus}
+            title={t`New Skill`}
+            size="small"
+            variant="secondary"
+          />
+        </UndecoratedLink>
+      </StyledHeaderContainer>
+
+      <StyledSearchContainer>
+        <StyledSearchInput
+          instanceId="skill-table-search"
+          LeftIcon={IconSearch}
+          placeholder={t`Search a skill...`}
+          value={searchTerm}
+          onChange={setSearchTerm}
+        />
+        <Dropdown
+          dropdownId="settings-skills-filter-dropdown"
+          clickableComponent={
+            <LightIconButton
+              aria-label={t`Filter skills`}
+              Icon={IconFilterCog}
+              accent="tertiary"
+            />
+          }
+          dropdownComponents={
+            <DropdownContent>
+              <DropdownMenuItemsContainer>
+                <MenuItemToggle
+                  LeftIcon={IconArchive}
+                  onToggleChange={() => setShowDeactivated(!showDeactivated)}
+                  toggled={showDeactivated}
+                  text={t`Deactivated`}
+                  toggleSize="small"
+                />
+              </DropdownMenuItemsContainer>
+            </DropdownContent>
+          }
+        />
+      </StyledSearchContainer>
+
+      <StyledTable>
+        <StyledTableHeaderRow>
+          {SETTINGS_SKILL_TABLE_METADATA.fields.map(
+            (settingsSkillTableMetadataField) => (
+              <SortableTableHeader
+                key={settingsSkillTableMetadataField.fieldName}
+                fieldName={settingsSkillTableMetadataField.fieldName}
+                label={t(settingsSkillTableMetadataField.fieldLabel)}
+                tableId={SETTINGS_SKILL_TABLE_METADATA.tableId}
+                align={settingsSkillTableMetadataField.align}
+                initialSort={SETTINGS_SKILL_TABLE_METADATA.initialSort}
+              />
+            ),
+          )}
+          <TableHeader />
+        </StyledTableHeaderRow>
+        {showSkeleton
+          ? Array.from({ length: 3 }).map((_, index) => (
+              <Skeleton height={32} borderRadius={4} key={index} />
+            ))
+          : filteredSkills.map((skill) => (
+              <SettingsSkillTableRow
+                key={skill.id}
+                skill={skill}
+                action={
+                  skill.isActive ? (
+                    <IconChevronRight
+                      size={theme.icon.size.md}
+                      stroke={theme.icon.stroke.sm}
+                    />
+                  ) : (
+                    <SettingsSkillInactiveMenuDropDown
+                      isCustomSkill={skill.isCustom}
+                      skillId={skill.id}
+                      onActivate={() => handleActivate(skill.id)}
+                      onDelete={() => handleDelete(skill.id)}
+                    />
+                  )
+                }
+                link={
+                  skill.isActive
+                    ? getSettingsPath(SettingsPath.AISkillDetail, {
+                        skillId: skill.id,
+                      })
+                    : undefined
+                }
+              />
+            ))}
+      </StyledTable>
+    </Section>
+  );
+};
diff --git a/packages/twenty-front/src/pages/settings/ai/constants/SettingsSkillTableMetadata.ts b/packages/twenty-front/src/pages/settings/ai/constants/SettingsSkillTableMetadata.ts
new file mode 100644
index 00000000000..68609eab4f0
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/ai/constants/SettingsSkillTableMetadata.ts
@@ -0,0 +1,26 @@
+import { type TableMetadata } from '@/ui/layout/table/types/TableMetadata';
+import { msg } from '@lingui/core/macro';
+
+import { type Skill } from '~/generated-metadata/graphql';
+
+export const SETTINGS_SKILL_TABLE_METADATA: TableMetadata<Skill> = {
+  tableId: 'settingsSkill',
+  fields: [
+    {
+      fieldLabel: msg`Name`,
+      fieldName: 'name',
+      fieldType: 'string',
+      align: 'left',
+    },
+    {
+      fieldLabel: msg`Type`,
+      fieldName: 'isCustom',
+      fieldType: 'string',
+      align: 'left',
+    },
+  ],
+  initialSort: {
+    fieldName: 'name',
+    orderBy: 'AscNullsLast',
+  },
+};
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/common/1767003000000-add-skill-entity.ts b/packages/twenty-server/src/database/typeorm/core/migrations/common/1767003000000-add-skill-entity.ts
new file mode 100644
index 00000000000..dcc163c908b
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/common/1767003000000-add-skill-entity.ts
@@ -0,0 +1,43 @@
+import { type MigrationInterface, type QueryRunner } from 'typeorm';
+
+export class AddSkillEntity1767003000000 implements MigrationInterface {
+  name = 'AddSkillEntity1767003000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "core"."skill" ("universalIdentifier" uuid, "applicationId" uuid, "workspaceId" uuid NOT NULL, "id" uuid NOT NULL DEFAULT uuid_generate_v4(), "standardId" uuid, "name" character varying NOT NULL, "label" character varying NOT NULL, "icon" character varying, "description" text, "content" text NOT NULL, "isCustom" boolean NOT NULL DEFAULT false, "isActive" boolean NOT NULL DEFAULT true, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), CONSTRAINT "PK_a5167c44f4d4e61423f7f5e43bf" PRIMARY KEY ("id"))`,
+    );
+    await queryRunner.query(
+      `CREATE UNIQUE INDEX "IDX_e6398c21e6bb31b525272fac84" ON "core"."skill" ("workspaceId", "universalIdentifier")`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_SKILL_ID_IS_ACTIVE" ON "core"."skill" ("id", "isActive")`,
+    );
+    await queryRunner.query(
+      `CREATE UNIQUE INDEX "IDX_SKILL_NAME_WORKSPACE_ID_UNIQUE" ON "core"."skill" ("name", "workspaceId") WHERE "isActive" = true`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."skill" ADD CONSTRAINT "FK_b832ffda9048fae83e52fbe48a7" FOREIGN KEY ("workspaceId") REFERENCES "core"."workspace"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."skill" ADD CONSTRAINT "FK_46f69b93b58666bb388c5c7785a" FOREIGN KEY ("applicationId") REFERENCES "core"."application"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."skill" DROP CONSTRAINT "FK_46f69b93b58666bb388c5c7785a"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."skill" DROP CONSTRAINT "FK_b832ffda9048fae83e52fbe48a7"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "core"."IDX_SKILL_NAME_WORKSPACE_ID_UNIQUE"`,
+    );
+    await queryRunner.query(`DROP INDEX "core"."IDX_SKILL_ID_IS_ACTIVE"`);
+    await queryRunner.query(
+      `DROP INDEX "core"."IDX_e6398c21e6bb31b525272fac84"`,
+    );
+    await queryRunner.query(`DROP TABLE "core"."skill"`);
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/skills/skill-definition.type.ts b/packages/twenty-server/src/engine/core-modules/skills/skill-definition.type.ts
deleted file mode 100644
index 0d7d391c9e8..00000000000
--- a/packages/twenty-server/src/engine/core-modules/skills/skill-definition.type.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export type SkillDefinition = {
-  name: string;
-  label: string;
-  description: string;
-  content: string;
-};
diff --git a/packages/twenty-server/src/engine/core-modules/skills/skills.module.ts b/packages/twenty-server/src/engine/core-modules/skills/skills.module.ts
deleted file mode 100644
index 434da654393..00000000000
--- a/packages/twenty-server/src/engine/core-modules/skills/skills.module.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { SkillsService } from './skills.service';
-
-@Module({
-  providers: [SkillsService],
-  exports: [SkillsService],
-})
-export class SkillsModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/skills/skills.service.ts b/packages/twenty-server/src/engine/core-modules/skills/skills.service.ts
deleted file mode 100644
index 52f667ecc16..00000000000
--- a/packages/twenty-server/src/engine/core-modules/skills/skills.service.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { SkillDefinition } from 'src/engine/core-modules/skills/skill-definition.type';
-import { CODE_INTERPRETER_SKILL } from 'src/engine/core-modules/skills/skills/code-interpreter.skill';
-import { DASHBOARD_BUILDING_SKILL } from 'src/engine/core-modules/skills/skills/dashboard-building.skill';
-import { DATA_MANIPULATION_SKILL } from 'src/engine/core-modules/skills/skills/data-manipulation.skill';
-import { DOCX_SKILL } from 'src/engine/core-modules/skills/skills/docx.skill';
-import { METADATA_BUILDING_SKILL } from 'src/engine/core-modules/skills/skills/metadata-building.skill';
-import { PDF_SKILL } from 'src/engine/core-modules/skills/skills/pdf.skill';
-import { PPTX_SKILL } from 'src/engine/core-modules/skills/skills/pptx.skill';
-import { RESEARCH_SKILL } from 'src/engine/core-modules/skills/skills/research.skill';
-import { WORKFLOW_BUILDING_SKILL } from 'src/engine/core-modules/skills/skills/workflow-building.skill';
-import { XLSX_SKILL } from 'src/engine/core-modules/skills/skills/xlsx.skill';
-
-const SKILL_DEFINITIONS: SkillDefinition[] = [
-  WORKFLOW_BUILDING_SKILL,
-  DATA_MANIPULATION_SKILL,
-  DASHBOARD_BUILDING_SKILL,
-  METADATA_BUILDING_SKILL,
-  RESEARCH_SKILL,
-  CODE_INTERPRETER_SKILL,
-  XLSX_SKILL,
-  PDF_SKILL,
-  DOCX_SKILL,
-  PPTX_SKILL,
-];
-
-export type Skill = {
-  name: string;
-  label: string;
-  description: string;
-  content: string;
-};
-
-@Injectable()
-export class SkillsService {
-  getAllSkills(): Skill[] {
-    return SKILL_DEFINITIONS.map((skill) => ({
-      name: skill.name,
-      label: skill.label,
-      description: skill.description,
-      content: skill.content,
-    }));
-  }
-
-  getSkillByName(name: string): Skill | undefined {
-    const skillDef = SKILL_DEFINITIONS.find((skill) => skill.name === name);
-
-    if (!skillDef) {
-      return undefined;
-    }
-
-    return {
-      name: skillDef.name,
-      label: skillDef.label,
-      description: skillDef.description,
-      content: skillDef.content,
-    };
-  }
-
-  getSkillsByNames(names: string[]): Skill[] {
-    return names
-      .map((name) => this.getSkillByName(name))
-      .filter((skill): skill is Skill => skill !== undefined);
-  }
-}
diff --git a/packages/twenty-server/src/engine/core-modules/skills/skills/code-interpreter.skill.ts b/packages/twenty-server/src/engine/core-modules/skills/skills/code-interpreter.skill.ts
deleted file mode 100644
index e9605169607..00000000000
--- a/packages/twenty-server/src/engine/core-modules/skills/skills/code-interpreter.skill.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import { type SkillDefinition } from 'src/engine/core-modules/skills/skill-definition.type';
-
-export const CODE_INTERPRETER_SKILL: SkillDefinition = {
-  name: 'code-interpreter',
-  label: 'Code Interpreter',
-  description:
-    'Python code execution for data analysis, complex multi-step operations, and efficient bulk processing via MCP bridge',
-  content: `# Code Interpreter Skill
-
-You have access to the \`code_interpreter\` tool to execute Python code in a sandboxed environment.
-
-## How to Use
-Call the \`code_interpreter\` tool with your Python code. The tool will execute the code and return stdout, stderr, and any generated files.
-
-## Capabilities
-- Analyze CSV, Excel, and JSON data files
-- Create charts and visualizations (matplotlib, seaborn)
-- Generate reports (PDF, PPTX, Excel)
-- Perform calculations and data transformations
-
-## Pre-installed Libraries
-pandas, numpy, matplotlib, seaborn, scikit-learn, openpyxl, python-pptx
-
-## Input Files
-- User-uploaded files are available at \`/home/user/{filename}\`
-- Always check the file exists before processing
-
-## Output Files
-- Charts: Save to \`/home/user/output/\` directory - these are automatically returned as downloadable URLs
-- For matplotlib: \`plt.savefig('/home/user/output/chart.png')\`
-- Generated files: Save to \`/home/user/output/{filename}\`
-
-## Example: Create a Bar Chart
-\`\`\`python
-import matplotlib.pyplot as plt
-import os
-
-# Data
-months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun']
-sales = [100, 150, 200, 175, 250, 300]
-
-# Create chart
-plt.figure(figsize=(10, 6))
-plt.bar(months, sales, color='skyblue')
-plt.title('Monthly Sales')
-plt.xlabel('Month')
-plt.ylabel('Sales')
-plt.tight_layout()
-
-# Save to output directory
-os.makedirs('/home/user/output', exist_ok=True)
-plt.savefig('/home/user/output/sales_chart.png')
-print('Chart saved!')
-\`\`\`
-
-## Example: Analyze CSV
-\`\`\`python
-import pandas as pd
-import matplotlib.pyplot as plt
-import os
-
-# Load data
-df = pd.read_csv('/home/user/data.csv')
-print(f"Loaded {len(df)} rows")
-
-# Create visualization
-plt.figure(figsize=(10, 6))
-df.groupby('category')['value'].mean().plot(kind='bar')
-plt.title('Average Value by Category')
-plt.tight_layout()
-
-os.makedirs('/home/user/output', exist_ok=True)
-plt.savefig('/home/user/output/analysis.png')
-print('Analysis complete!')
-\`\`\`
-
-## Calling Twenty Tools from Python (MCP Bridge)
-
-A \`twenty\` helper is automatically available in your code. Use it to call any Twenty tool directly from Python:
-
-\`\`\`python
-# Find records
-people = twenty.call_tool('find_person_records', {'limit': 10})
-print(f"Found {len(people['edges'])} people")
-
-# Create a record
-result = twenty.call_tool('create_company_record', {
-    'data': {'name': 'Acme Corp', 'domainName': {'primaryLinkUrl': 'acme.com'}}
-})
-print(f"Created company: {result['id']}")
-
-# Update a record
-twenty.call_tool('update_person_record', {
-    'id': 'person-uuid',
-    'data': {'jobTitle': 'CEO'}
-})
-
-# List available tools
-tools = twenty.list_tools()
-for tool in tools:
-    print(f"- {tool['name']}: {tool['description']}")
-\`\`\`
-
-This allows you to orchestrate complex multi-step operations in a single code execution, which is more efficient than multiple tool calls.`,
-};
diff --git a/packages/twenty-server/src/engine/core-modules/skills/skills/dashboard-building.skill.ts b/packages/twenty-server/src/engine/core-modules/skills/skills/dashboard-building.skill.ts
deleted file mode 100644
index e0828c1e1ec..00000000000
--- a/packages/twenty-server/src/engine/core-modules/skills/skills/dashboard-building.skill.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { type SkillDefinition } from 'src/engine/core-modules/skills/skill-definition.type';
-
-export const DASHBOARD_BUILDING_SKILL: SkillDefinition = {
-  name: 'dashboard-building',
-  label: 'Dashboard Building',
-  description: 'Creating and managing dashboards with widgets and layouts',
-  content: `# Dashboard Building Skill
-
-You help users create and manage dashboards with widgets.
-
-## CRITICAL: Creating GRAPH Widgets
-
-Before creating any GRAPH widget, you MUST:
-1. Use list_object_metadata_items to get the objectMetadataId (e.g., for "opportunity", "company")
-2. From the response, get the field IDs you need (aggregateFieldMetadataId, primaryAxisGroupByFieldMetadataId)
-
-GRAPH widgets require real UUIDs from the workspace metadata, NOT made-up values.
-
-## Widget Configuration
-
-### GRAPH - AGGREGATE (KPI numbers)
-Shows a single aggregated value (count, sum, average).
-Required:
-- objectMetadataId: UUID of the object (e.g., opportunity)
-- configuration.graphType: "AGGREGATE"
-- configuration.aggregateFieldMetadataId: UUID of field to aggregate
-- configuration.aggregateOperation: "COUNT", "SUM", "AVG", "MIN", "MAX"
-
-### GRAPH - BAR/LINE Charts
-Shows data grouped by a dimension.
-Required:
-- objectMetadataId: UUID of the object
-- configuration.graphType: "VERTICAL_BAR", "HORIZONTAL_BAR", or "LINE"
-- configuration.aggregateFieldMetadataId: field to aggregate
-- configuration.aggregateOperation: aggregation type
-- configuration.primaryAxisGroupByFieldMetadataId: field to group by (x-axis)
-
-### GRAPH - PIE Charts
-Shows data distribution as slices.
-Required:
-- objectMetadataId: UUID of the object
-- configuration.graphType: "PIE"
-- configuration.aggregateFieldMetadataId: field to aggregate
-- configuration.aggregateOperation: aggregation type
-- configuration.groupByFieldMetadataId: field to slice by
-
-### IFRAME
-Embeds external content:
-- configuration.url: "https://..."
-
-### STANDALONE_RICH_TEXT
-Text content widget:
-- configuration.body: "Your text here"
-
-## Grid System
-
-- 12 columns (0-11)
-- KPI widgets: rowSpan 2-4, columnSpan 3-4
-- Charts: rowSpan 6-8, columnSpan 6-12
-- Common layouts:
-  - 4 KPIs in a row: each { columnSpan: 3 }
-  - 2 charts side by side: each { columnSpan: 6 }
-  - Full width chart: { column: 0, columnSpan: 12 }
-
-## Workflow
-
-1. Ask user what data they want to visualize
-2. Load list_object_metadata_items to discover available objects and fields
-3. Create dashboard with appropriate widgets using real field IDs
-4. Use get_dashboard to verify creation
-
-## Best Practices
-
-- Place KPIs at the top (row 0)
-- Group related charts together
-- Use consistent heights within rows
-- Start simple, add complexity as needed`,
-};
diff --git a/packages/twenty-server/src/engine/core-modules/skills/skills/data-manipulation.skill.ts b/packages/twenty-server/src/engine/core-modules/skills/skills/data-manipulation.skill.ts
deleted file mode 100644
index 323de52f582..00000000000
--- a/packages/twenty-server/src/engine/core-modules/skills/skills/data-manipulation.skill.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { type SkillDefinition } from 'src/engine/core-modules/skills/skill-definition.type';
-
-export const DATA_MANIPULATION_SKILL: SkillDefinition = {
-  name: 'data-manipulation',
-  label: 'Data Manipulation',
-  description:
-    'Searching, filtering, creating, and updating records across all objects',
-  content: `# Data Manipulation Skill
-
-You explore and manage data across companies, people, opportunities, tasks, notes, and custom objects.
-
-## Capabilities
-
-- Search, filter, sort, create, update records
-- Manage relationships between records
-- Bulk operations and data analysis
-
-## Constraints
-
-- READ and WRITE access to all objects
-- CANNOT delete records or access workflow objects
-- CANNOT modify workspace settings
-
-## Multi-step Approach
-
-- Chain queries to solve complex requests (e.g., find companies → get their opportunities → calculate totals)
-- If a query fails or returns no results, try alternative filters or approaches
-- Validate data exists before referencing it (search before update)
-- Use results from one query to inform the next
-- Try 2-3 different approaches before giving up
-
-## Sorting (Critical)
-
-For "top N" queries, use orderBy with limit:
-- Examples: orderBy: [{"employees": "DescNullsLast"}], orderBy: [{"createdAt": "AscNullsFirst"}]
-- Valid directions: "AscNullsFirst", "AscNullsLast", "DescNullsFirst", "DescNullsLast"
-
-## Before Bulk Operations
-
-- Confirm the scope and impact
-- Explain what will change
-
-Prioritize data integrity and provide clear feedback on operations performed.`,
-};
diff --git a/packages/twenty-server/src/engine/core-modules/skills/skills/docx.skill.ts b/packages/twenty-server/src/engine/core-modules/skills/skills/docx.skill.ts
deleted file mode 100644
index ac7f70dfad6..00000000000
--- a/packages/twenty-server/src/engine/core-modules/skills/skills/docx.skill.ts
+++ /dev/null
@@ -1,152 +0,0 @@
-import { type SkillDefinition } from 'src/engine/core-modules/skills/skill-definition.type';
-
-export const DOCX_SKILL: SkillDefinition = {
-  name: 'docx',
-  label: 'Word Documents',
-  description:
-    'Word document creation, editing, template processing, and OOXML manipulation',
-  content: `# Word Document Processing Skill
-
-**IMPORTANT**: Save all output files to \`/home/user/output/\` for them to be downloadable.
-
-## Pre-installed Scripts (OOXML Editing)
-
-- \`python /home/user/scripts/docx/unpack.py <docx_file> <output_dir>\` - Unpack .docx to XML files for direct editing
-- \`python /home/user/scripts/docx/pack.py <input_dir> <docx_file>\` - Repack XML files into .docx
-- \`python /home/user/scripts/docx/validate.py <docx_file>\` - Validate document structure
-
-### Validation Scripts
-- \`/home/user/scripts/docx/validation/docx.py\` - DOCX validation module
-- \`/home/user/scripts/docx/validation/redlining.py\` - Track changes/redline validation
-
-## High-Level API (python-docx)
-
-### Reading Documents
-
-\`\`\`python
-from docx import Document
-
-doc = Document('document.docx')
-
-# Read paragraphs
-for para in doc.paragraphs:
-    print(para.text)
-
-# Read tables
-for table in doc.tables:
-    for row in table.rows:
-        for cell in row.cells:
-            print(cell.text)
-\`\`\`
-
-### Creating Documents
-
-\`\`\`python
-from docx import Document
-from docx.shared import Inches, Pt
-from docx.enum.text import WD_ALIGN_PARAGRAPH
-
-doc = Document()
-
-# Add heading
-doc.add_heading('Document Title', 0)
-
-# Add paragraph with formatting
-para = doc.add_paragraph('Normal text. ')
-run = para.add_run('Bold text.')
-run.bold = True
-
-# Add table
-table = doc.add_table(rows=2, cols=2)
-table.cell(0, 0).text = 'Header 1'
-table.cell(0, 1).text = 'Header 2'
-
-# Add image
-doc.add_picture('image.png', width=Inches(4))
-
-doc.save('/home/user/output/output.docx')
-\`\`\`
-
-## Low-Level OOXML Editing
-
-For complex edits (tracked changes, custom XML), use the unpack/edit/pack workflow:
-
-### Step 1: Unpack
-\`\`\`bash
-python /home/user/scripts/docx/unpack.py document.docx ./unpacked/
-\`\`\`
-
-### Step 2: Edit XML directly
-\`\`\`python
-import xml.etree.ElementTree as ET
-
-tree = ET.parse('./unpacked/word/document.xml')
-root = tree.getroot()
-
-# Edit XML...
-# Namespaces: w = http://schemas.openxmlformats.org/wordprocessingml/2006/main
-
-tree.write('./unpacked/word/document.xml', xml_declaration=True, encoding='UTF-8')
-\`\`\`
-
-### Step 3: Validate & Repack
-\`\`\`bash
-python /home/user/scripts/docx/validate.py ./unpacked/
-python /home/user/scripts/docx/pack.py ./unpacked/ /home/user/output/output.docx
-\`\`\`
-
-## Template Processing
-
-### Find and Replace
-\`\`\`python
-from docx import Document
-
-doc = Document('template.docx')
-
-for para in doc.paragraphs:
-    if '{{name}}' in para.text:
-        para.text = para.text.replace('{{name}}', 'John Doe')
-
-doc.save('/home/user/output/filled.docx')
-\`\`\`
-
-### Preserve Formatting During Replace
-\`\`\`python
-def replace_in_paragraph(para, old_text, new_text):
-    """Replace text while preserving formatting"""
-    for run in para.runs:
-        if old_text in run.text:
-            run.text = run.text.replace(old_text, new_text)
-
-for para in doc.paragraphs:
-    replace_in_paragraph(para, '{{name}}', 'John Doe')
-\`\`\`
-
-## Working with Styles
-
-\`\`\`python
-from docx.shared import Pt, RGBColor
-
-# Set font
-run.font.name = 'Arial'
-run.font.size = Pt(12)
-run.font.color.rgb = RGBColor(0, 0, 0)
-
-# Paragraph formatting
-para.alignment = WD_ALIGN_PARAGRAPH.CENTER
-para.paragraph_format.space_before = Pt(12)
-para.paragraph_format.space_after = Pt(12)
-\`\`\`
-
-## Quick Reference
-
-| Task | Tool | Example |
-|------|------|---------|
-| Read document | python-docx | \`Document('file.docx')\` |
-| Create document | python-docx | \`Document()\` |
-| Add heading | python-docx | \`doc.add_heading('Title', 0)\` |
-| Add table | python-docx | \`doc.add_table(rows=2, cols=2)\` |
-| Unpack for editing | script | \`python unpack.py doc.docx ./out/\` |
-| Repack | script | \`python pack.py ./out/ doc.docx\` |
-| Validate | script | \`python validate.py doc.docx\` |`,
-};
diff --git a/packages/twenty-server/src/engine/core-modules/skills/skills/metadata-building.skill.ts b/packages/twenty-server/src/engine/core-modules/skills/skills/metadata-building.skill.ts
deleted file mode 100644
index c58af5f026a..00000000000
--- a/packages/twenty-server/src/engine/core-modules/skills/skills/metadata-building.skill.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { type SkillDefinition } from 'src/engine/core-modules/skills/skill-definition.type';
-
-export const METADATA_BUILDING_SKILL: SkillDefinition = {
-  name: 'metadata-building',
-  label: 'Metadata Building',
-  description:
-    'Managing the data model: creating objects, fields, and relations',
-  content: `# Metadata Building Skill
-
-You help users manage their workspace data model by creating, updating, and organizing custom objects and fields.
-
-## Capabilities
-
-- Create new custom objects with appropriate naming and configuration
-- Add fields to existing objects (text, number, date, select, relation, etc.)
-- Update object and field properties (labels, descriptions, icons)
-- Manage field settings (required, unique, default values)
-- Create relations between objects
-
-## Key Concepts
-
-- **Objects**: Represent entities in the data model (e.g., Company, Person, Opportunity)
-- **Fields**: Properties of objects with specific types (TEXT, NUMBER, DATE_TIME, SELECT, RELATION, etc.)
-- **Relations**: Links between objects (one-to-many, many-to-one)
-- **Labels vs Names**: Labels are for display, names are internal identifiers (camelCase)
-
-## Field Types Available
-
-- **TEXT**: Simple text fields
-- **NUMBER**: Numeric values (integers or decimals)
-- **BOOLEAN**: True/false values
-- **DATE_TIME**: Date and time values
-- **DATE**: Date only values
-- **SELECT**: Single choice from options
-- **MULTI_SELECT**: Multiple choices from options
-- **LINK**: URL fields
-- **LINKS**: Multiple URL fields
-- **EMAIL**: Email address fields
-- **EMAILS**: Multiple email fields
-- **PHONE**: Phone number fields
-- **PHONES**: Multiple phone fields
-- **CURRENCY**: Monetary values
-- **RATING**: Star ratings
-- **RELATION**: Links to other objects
-- **RICH_TEXT**: Formatted text content
-
-## Best Practices
-
-- Use clear, descriptive names for objects and fields
-- Follow naming conventions: singular for object names, camelCase for field names
-- Add helpful descriptions to objects and fields
-- Choose appropriate field types for the data being stored
-- Consider relationships between objects when designing the data model
-
-## Approach
-
-- Ask clarifying questions to understand the user's data modeling needs
-- Suggest best practices for naming and organization
-- Explain the impact of changes to the data model
-- Verify object and field existence before making updates
-- Provide clear feedback on operations performed
-
-Prioritize data model integrity and user understanding.`,
-};
diff --git a/packages/twenty-server/src/engine/core-modules/skills/skills/pdf.skill.ts b/packages/twenty-server/src/engine/core-modules/skills/skills/pdf.skill.ts
deleted file mode 100644
index af4f152cd95..00000000000
--- a/packages/twenty-server/src/engine/core-modules/skills/skills/pdf.skill.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-import { type SkillDefinition } from 'src/engine/core-modules/skills/skill-definition.type';
-
-export const PDF_SKILL: SkillDefinition = {
-  name: 'pdf',
-  label: 'PDF Processing',
-  description:
-    'PDF form filling, field extraction, table parsing, and validation',
-  content: `# PDF Processing Skill
-
-**IMPORTANT**: Save all output files to \`/home/user/output/\` for them to be downloadable.
-
-## Pre-installed Scripts
-
-### Field Extraction
-- \`python /home/user/scripts/pdf/extract_form_field_info.py <pdf_file>\` - Extract all fillable field names and types (JSON output)
-- \`python /home/user/scripts/pdf/check_fillable_fields.py <pdf_file>\` - Check if PDF has fillable fields
-
-### Form Filling
-- \`python /home/user/scripts/pdf/fill_fillable_fields.py <pdf_file> <json_data> <output_file>\` - Fill PDF form fields
-- \`python /home/user/scripts/pdf/fill_pdf_form_with_annotations.py <pdf_file> <json_data> <output_file>\` - Fill with annotation support
-
-### Validation
-- \`python /home/user/scripts/pdf/create_validation_image.py <pdf_file>\` - Create validation image of filled PDF
-- \`python /home/user/scripts/pdf/check_bounding_boxes.py <pdf_file>\` - Check field boundaries
-- \`python /home/user/scripts/pdf/convert_pdf_to_images.py <pdf_file>\` - Convert PDF pages to images
-
-## Reading PDFs
-
-\`\`\`python
-import fitz  # PyMuPDF
-
-# Open PDF
-doc = fitz.open('document.pdf')
-
-# Extract text from all pages
-for page in doc:
-    text = page.get_text()
-    print(text)
-
-# Extract text from specific page
-page = doc[0]  # First page
-text = page.get_text()
-\`\`\`
-
-## Extracting Tables
-
-\`\`\`python
-import pdfplumber
-
-with pdfplumber.open('document.pdf') as pdf:
-    for page in pdf.pages:
-        tables = page.extract_tables()
-        for table in tables:
-            for row in table:
-                print(row)
-\`\`\`
-
-## Filling PDF Forms
-
-### Step 1: Extract field information
-\`\`\`bash
-python /home/user/scripts/pdf/extract_form_field_info.py form.pdf > fields.json
-\`\`\`
-
-### Step 2: Create fill data JSON
-\`\`\`json
-{
-  "field_name_1": "value1",
-  "field_name_2": "value2",
-  "checkbox_field": true
-}
-\`\`\`
-
-### Step 3: Fill the form
-\`\`\`bash
-python /home/user/scripts/pdf/fill_fillable_fields.py form.pdf fill_data.json /home/user/output/output.pdf
-\`\`\`
-
-### Step 4: Validate the output
-\`\`\`bash
-python /home/user/scripts/pdf/create_validation_image.py /home/user/output/output.pdf
-\`\`\`
-
-## Creating PDFs
-
-\`\`\`python
-from reportlab.lib.pagesizes import letter
-from reportlab.pdfgen import canvas
-
-c = canvas.Canvas('/home/user/output/output.pdf', pagesize=letter)
-c.drawString(100, 750, 'Hello World!')
-c.save()
-\`\`\`
-
-## Merging PDFs
-
-\`\`\`python
-from PyPDF2 import PdfMerger
-
-merger = PdfMerger()
-merger.append('file1.pdf')
-merger.append('file2.pdf')
-merger.write('/home/user/output/merged.pdf')
-merger.close()
-\`\`\`
-
-## Splitting PDFs
-
-\`\`\`python
-from PyPDF2 import PdfReader, PdfWriter
-
-reader = PdfReader('document.pdf')
-
-# Extract specific pages
-writer = PdfWriter()
-writer.add_page(reader.pages[0])  # First page
-writer.write('/home/user/output/page1.pdf')
-\`\`\`
-
-## Quick Reference
-
-| Task | Tool | Command/Example |
-|------|------|-----------------|
-| Extract text | PyMuPDF | \`page.get_text()\` |
-| Extract tables | pdfplumber | \`page.extract_tables()\` |
-| List form fields | script | \`python extract_form_field_info.py form.pdf\` |
-| Fill form | script | \`python fill_fillable_fields.py form.pdf data.json out.pdf\` |
-| Validate fill | script | \`python create_validation_image.py filled.pdf\` |
-| Create PDF | reportlab | \`canvas.Canvas('out.pdf')\` |
-| Merge PDFs | PyPDF2 | \`PdfMerger()\` |`,
-};
diff --git a/packages/twenty-server/src/engine/core-modules/skills/skills/pptx.skill.ts b/packages/twenty-server/src/engine/core-modules/skills/skills/pptx.skill.ts
deleted file mode 100644
index 3de69dbd5ab..00000000000
--- a/packages/twenty-server/src/engine/core-modules/skills/skills/pptx.skill.ts
+++ /dev/null
@@ -1,170 +0,0 @@
-import { type SkillDefinition } from 'src/engine/core-modules/skills/skill-definition.type';
-
-export const PPTX_SKILL: SkillDefinition = {
-  name: 'pptx',
-  label: 'PowerPoint',
-  description:
-    'PowerPoint creation, editing, templates, thumbnails, and slide manipulation',
-  content: `# PowerPoint Processing Skill
-
-**IMPORTANT**: Save all output files to \`/home/user/output/\` for them to be downloadable.
-
-## Pre-installed Scripts
-
-- \`python /home/user/scripts/pptx/thumbnail.py <pptx_file> [output_dir]\` - Generate slide thumbnails
-- \`python /home/user/scripts/pptx/rearrange.py <pptx_file> <slide_order_json> <output_file>\` - Reorder slides
-- \`python /home/user/scripts/pptx/inventory.py <pptx_file>\` - List all slides and their content
-- \`python /home/user/scripts/pptx/replace.py <pptx_file> <replacements_json> <output_file>\` - Find/replace text
-
-## Reading Presentations
-
-\`\`\`python
-from pptx import Presentation
-
-prs = Presentation('presentation.pptx')
-
-# Iterate through slides
-for slide in prs.slides:
-    for shape in slide.shapes:
-        if shape.has_text_frame:
-            print(shape.text)
-\`\`\`
-
-## Creating Presentations
-
-\`\`\`python
-from pptx import Presentation
-from pptx.util import Inches, Pt
-
-prs = Presentation()
-
-# Add title slide
-slide_layout = prs.slide_layouts[0]  # Title layout
-slide = prs.slides.add_slide(slide_layout)
-title = slide.shapes.title
-subtitle = slide.placeholders[1]
-
-title.text = "Presentation Title"
-subtitle.text = "Subtitle goes here"
-
-# Add content slide
-slide_layout = prs.slide_layouts[1]  # Title and content
-slide = prs.slides.add_slide(slide_layout)
-title = slide.shapes.title
-body = slide.placeholders[1]
-
-title.text = "Slide Title"
-tf = body.text_frame
-tf.text = "First bullet"
-p = tf.add_paragraph()
-p.text = "Second bullet"
-p.level = 1
-
-prs.save('/home/user/output/output.pptx')
-\`\`\`
-
-## Adding Images
-
-\`\`\`python
-from pptx.util import Inches
-
-slide = prs.slides.add_slide(prs.slide_layouts[6])  # Blank layout
-slide.shapes.add_picture(
-    'image.png',
-    left=Inches(1),
-    top=Inches(1),
-    width=Inches(5)
-)
-\`\`\`
-
-## Adding Tables
-
-\`\`\`python
-from pptx.util import Inches
-
-slide = prs.slides.add_slide(prs.slide_layouts[6])
-table = slide.shapes.add_table(
-    rows=3, cols=3,
-    left=Inches(1), top=Inches(1),
-    width=Inches(8), height=Inches(2)
-).table
-
-# Set cell values
-table.cell(0, 0).text = "Header 1"
-table.cell(0, 1).text = "Header 2"
-table.cell(1, 0).text = "Data 1"
-\`\`\`
-
-## Adding Charts
-
-\`\`\`python
-from pptx.chart.data import CategoryChartData
-from pptx.enum.chart import XL_CHART_TYPE
-from pptx.util import Inches
-
-chart_data = CategoryChartData()
-chart_data.categories = ['East', 'West', 'Midwest']
-chart_data.add_series('Series 1', (19.2, 21.4, 16.7))
-
-slide = prs.slides.add_slide(prs.slide_layouts[6])
-chart = slide.shapes.add_chart(
-    XL_CHART_TYPE.COLUMN_CLUSTERED,
-    Inches(1), Inches(1), Inches(8), Inches(5),
-    chart_data
-).chart
-\`\`\`
-
-## Using Scripts
-
-### Generate Thumbnails
-\`\`\`bash
-python /home/user/scripts/pptx/thumbnail.py presentation.pptx ./thumbnails/
-# Creates: thumbnails/slide_1.png, slide_2.png, etc.
-\`\`\`
-
-### Get Slide Inventory
-\`\`\`bash
-python /home/user/scripts/pptx/inventory.py presentation.pptx
-# Returns JSON with all slide content and shapes
-\`\`\`
-
-### Reorder Slides
-\`\`\`bash
-# Order: [3, 1, 2] means slide 3 becomes first, slide 1 second, etc.
-python /home/user/scripts/pptx/rearrange.py input.pptx '[3, 1, 2]' output.pptx
-\`\`\`
-
-### Find and Replace Text
-\`\`\`bash
-python /home/user/scripts/pptx/replace.py input.pptx '{"{{company}}": "Acme Corp", "{{date}}": "2024"}' output.pptx
-\`\`\`
-
-## Template Processing Workflow
-
-1. **Generate thumbnails** to understand slide structure:
-   \`\`\`bash
-   python /home/user/scripts/pptx/thumbnail.py template.pptx ./preview/
-   \`\`\`
-
-2. **Get inventory** to find placeholder text:
-   \`\`\`bash
-   python /home/user/scripts/pptx/inventory.py template.pptx
-   \`\`\`
-
-3. **Replace placeholders**:
-   \`\`\`bash
-   python /home/user/scripts/pptx/replace.py template.pptx '{"{{title}}": "Q4 Report"}' output.pptx
-   \`\`\`
-
-## Quick Reference
-
-| Task | Tool | Example |
-|------|------|---------|
-| Read presentation | python-pptx | \`Presentation('file.pptx')\` |
-| Create presentation | python-pptx | \`Presentation()\` |
-| Add slide | python-pptx | \`prs.slides.add_slide(layout)\` |
-| Generate thumbnails | script | \`python thumbnail.py pres.pptx ./out/\` |
-| Get slide inventory | script | \`python inventory.py pres.pptx\` |
-| Reorder slides | script | \`python rearrange.py pres.pptx '[2,1,3]' out.pptx\` |
-| Find/replace | script | \`python replace.py pres.pptx '{...}' out.pptx\` |`,
-};
diff --git a/packages/twenty-server/src/engine/core-modules/skills/skills/research.skill.ts b/packages/twenty-server/src/engine/core-modules/skills/skills/research.skill.ts
deleted file mode 100644
index 4648b90a8c6..00000000000
--- a/packages/twenty-server/src/engine/core-modules/skills/skills/research.skill.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { type SkillDefinition } from 'src/engine/core-modules/skills/skill-definition.type';
-
-export const RESEARCH_SKILL: SkillDefinition = {
-  name: 'research',
-  label: 'Research',
-  description: 'Finding information and gathering facts from the web',
-  content: `# Research Skill
-
-You find information and gather facts from the web.
-
-## Capabilities
-
-- Search for current information and facts
-- Research companies, people, technologies, trends
-- Gather competitive intelligence and market data
-- Find contact details and verify information
-
-## Research Strategy
-
-- Try multiple search queries from different angles
-- If initial searches fail, use alternative search terms
-- Cross-reference information when possible
-- Cite sources and provide context
-
-## Present Findings
-
-- Be thorough but concise
-- Organize information logically
-- Distinguish facts from speculation
-- Note if information might be outdated
-- Include relevant sources
-
-Be persistent in finding accurate information.`,
-};
diff --git a/packages/twenty-server/src/engine/core-modules/skills/skills/workflow-building.skill.ts b/packages/twenty-server/src/engine/core-modules/skills/skills/workflow-building.skill.ts
deleted file mode 100644
index 56cae0e8594..00000000000
--- a/packages/twenty-server/src/engine/core-modules/skills/skills/workflow-building.skill.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { type SkillDefinition } from 'src/engine/core-modules/skills/skill-definition.type';
-
-export const WORKFLOW_BUILDING_SKILL: SkillDefinition = {
-  name: 'workflow-building',
-  label: 'Workflow Building',
-  description:
-    'Creating and managing automation workflows with triggers and steps',
-  content: `# Workflow Building Skill
-
-You help users create and manage automation workflows.
-
-## Capabilities
-
-- Create workflows from scratch
-- Modify existing workflows (add, remove, update steps)
-- Explain workflow structure and suggest improvements
-
-## Key Concepts
-
-- **Triggers**: DATABASE_EVENT, MANUAL, CRON, WEBHOOK
-- **Steps**: CREATE_RECORD, SEND_EMAIL, CODE, etc.
-- **Data flow**: Use {{stepId.fieldName}} to reference previous step outputs
-- **Relationships**: Use nested objects like {"company": {"id": "{{reference}}"}}
-
-## CRON Trigger Settings Schema
-
-For CRON triggers, settings.type must be one of these exact values:
-
-1. **DAYS** - Daily schedule
-   - Requires: schedule: { day: number (1+), hour: number (0-23), minute: number (0-59) }
-   - Example: { type: "DAYS", schedule: { day: 1, hour: 9, minute: 0 }, outputSchema: {} }
-
-2. **HOURS** - Hourly schedule (USE THIS FOR "EVERY HOUR")
-   - Requires: schedule: { hour: number (1+), minute: number (0-59) }
-   - Example: { type: "HOURS", schedule: { hour: 1, minute: 0 }, outputSchema: {} }
-   - This runs every X hours at Y minutes past the hour
-
-3. **MINUTES** - Minute-based schedule
-   - Requires: schedule: { minute: number (1+) }
-   - Example: { type: "MINUTES", schedule: { minute: 15 }, outputSchema: {} }
-
-4. **CUSTOM** - Custom cron pattern
-   - Requires: pattern: string (cron expression)
-   - Example: { type: "CUSTOM", pattern: "0 * * * *", outputSchema: {} }
-
-## Critical Notes
-
-Always rely on tool schema definitions:
-- The workflow creation tool provides comprehensive schemas with examples
-- Follow schema definitions exactly for field names, types, and structures
-- Schema includes validation rules and common patterns
-
-## Approach
-
-- Ask clarifying questions to understand user needs
-- Suggest appropriate actions for the use case
-- Explain each step and why it's needed
-- For modifications, understand current structure first
-- Ensure workflow logic remains coherent
-
-Prioritize user understanding and workflow effectiveness.`,
-};
diff --git a/packages/twenty-server/src/engine/core-modules/skills/skills/xlsx.skill.ts b/packages/twenty-server/src/engine/core-modules/skills/skills/xlsx.skill.ts
deleted file mode 100644
index 8fe07f11135..00000000000
--- a/packages/twenty-server/src/engine/core-modules/skills/skills/xlsx.skill.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-import { type SkillDefinition } from 'src/engine/core-modules/skills/skill-definition.type';
-
-export const XLSX_SKILL: SkillDefinition = {
-  name: 'xlsx',
-  label: 'Excel & Spreadsheets',
-  description:
-    'Excel/spreadsheet creation, editing, and analysis with formulas, formatting, and visualization',
-  content: `# Excel Processing Skill
-
-**IMPORTANT**: Save all output files to \`/home/user/output/\` for them to be downloadable.
-
-## Pre-installed Scripts
-
-- \`python /home/user/scripts/xlsx/recalc.py <excel_file> [timeout]\` - Recalculate formulas using LibreOffice
-
-## Requirements
-
-### Zero Formula Errors
-Every Excel model MUST be delivered with ZERO formula errors (#REF!, #DIV/0!, #VALUE!, #N/A, #NAME?)
-
-### Use Formulas, Not Hardcoded Values
-**Always use Excel formulas instead of calculating values in Python and hardcoding them.**
-
-\`\`\`python
-# ❌ WRONG - Hardcoding
-total = df['Sales'].sum()
-sheet['B10'] = total
-
-# ✅ CORRECT - Using formulas
-sheet['B10'] = '=SUM(B2:B9)'
-\`\`\`
-
-## Reading and Analyzing Data
-
-\`\`\`python
-import pandas as pd
-
-# Read Excel
-df = pd.read_excel('file.xlsx')
-all_sheets = pd.read_excel('file.xlsx', sheet_name=None)  # All sheets as dict
-
-# Analyze
-df.head()
-df.info()
-df.describe()
-\`\`\`
-
-## Creating New Excel Files
-
-\`\`\`python
-from openpyxl import Workbook
-from openpyxl.styles import Font, PatternFill, Alignment
-
-wb = Workbook()
-sheet = wb.active
-
-# Add data
-sheet['A1'] = 'Hello'
-sheet.append(['Row', 'of', 'data'])
-
-# Add formula
-sheet['B2'] = '=SUM(A1:A10)'
-
-# Formatting
-sheet['A1'].font = Font(bold=True)
-sheet['A1'].fill = PatternFill('solid', start_color='FFFF00')
-sheet['A1'].alignment = Alignment(horizontal='center')
-
-# Column width
-sheet.column_dimensions['A'].width = 20
-
-wb.save('/home/user/output/output.xlsx')
-\`\`\`
-
-## Editing Existing Files
-
-\`\`\`python
-from openpyxl import load_workbook
-
-wb = load_workbook('existing.xlsx')
-sheet = wb.active
-
-# Modify cells
-sheet['A1'] = 'New Value'
-sheet.insert_rows(2)
-
-wb.save('/home/user/output/modified.xlsx')
-\`\`\`
-
-## Recalculating Formulas (MANDATORY)
-
-After creating/editing files with formulas, run:
-\`\`\`bash
-python /home/user/scripts/xlsx/recalc.py /home/user/output/output.xlsx
-\`\`\`
-
-The script returns JSON with error details:
-\`\`\`json
-{
-  "status": "success",
-  "total_errors": 0,
-  "total_formulas": 42,
-  "error_summary": {}
-}
-\`\`\`
-
-If errors found, fix them and recalculate again.
-
-## Financial Model Color Coding
-
-- **Blue text**: Hardcoded inputs
-- **Black text**: Formulas and calculations
-- **Green text**: Links from other worksheets
-- **Yellow background**: Key assumptions needing attention
-
-## Number Formatting
-
-- Years: Format as text ("2024" not "2,024")
-- Currency: Use $#,##0 format
-- Percentages: 0.0% format
-- Negatives: Use parentheses (123) not minus -123
-
-## Quick Reference
-
-| Task | Tool | Example |
-|------|------|---------|
-| Read Excel | pandas | \`pd.read_excel('file.xlsx')\` |
-| Create Excel | openpyxl | \`Workbook()\` |
-| Add formula | openpyxl | \`sheet['B2'] = '=SUM(A1:A10)'\` |
-| Recalculate | script | \`python /home/user/scripts/xlsx/recalc.py file.xlsx\` |`,
-};
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/tools/load-skill.tool.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/tools/load-skill.tool.ts
index e32faf400ae..1755a2bb4cf 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/tools/load-skill.tool.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/tools/load-skill.tool.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod';
 
-import { type Skill } from 'src/engine/core-modules/skills/skills.service';
+import { type FlatSkill } from 'src/engine/metadata-modules/flat-skill/types/flat-skill.type';
 
 export const LOAD_SKILL_TOOL_NAME = 'load_skill';
 
@@ -25,7 +25,7 @@ export type LoadSkillResult = {
   message: string;
 };
 
-export type LoadSkillFunction = (names: string[]) => Skill[];
+export type LoadSkillFunction = (names: string[]) => Promise<FlatSkill[]>;
 
 export const createLoadSkillTool = (loadSkills: LoadSkillFunction) => ({
   description:
@@ -36,7 +36,7 @@ export const createLoadSkillTool = (loadSkills: LoadSkillFunction) => ({
   }): Promise<LoadSkillResult> => {
     const { skillNames } = parameters.input;
 
-    const skills = loadSkills(skillNames);
+    const skills = await loadSkills(skillNames);
 
     if (skills.length === 0) {
       return {
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/constants/dollar-to-credit-multiplier.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/constants/dollar-to-credit-multiplier.ts
index ec4bdb1e98b..5b979215d13 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/constants/dollar-to-credit-multiplier.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/constants/dollar-to-credit-multiplier.ts
@@ -1,2 +1,2 @@
-// Configuration: $0.00001 = 1 credit
-export const DOLLAR_TO_CREDIT_MULTIPLIER = 1_000_000; // 1 / 0.000001 = 1 000 000 credits per dollar
+// Configuration: $0.000_001 = 1 credit
+export const DOLLAR_TO_CREDIT_MULTIPLIER = 1_000_000; // 1 / 0.000_001 = 1_000_000 credits per dollar
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/utils/convert-cents-to-billing-credits.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/utils/convert-cents-to-billing-credits.util.ts
index 05746d4753c..5475aa9f32f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/utils/convert-cents-to-billing-credits.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/utils/convert-cents-to-billing-credits.util.ts
@@ -2,7 +2,7 @@ import { DOLLAR_TO_CREDIT_MULTIPLIER } from 'src/engine/metadata-modules/ai/ai-b
 
 // Converts cost in cents to cost in credits
 // Formula: credits = (cents / 100) * DOLLAR_TO_CREDIT_MULTIPLIER
-// Where DOLLAR_TO_CREDIT_MULTIPLIER = 1000000 (so $0.00001 = 1 credit)
-// Example: 1 cent = (1 / 100) * 1000000 = 10000 credits
+// Where DOLLAR_TO_CREDIT_MULTIPLIER = 1_000_000 (so $0.000_001 = 1 credit)
+// Example: 1 cent = (1 / 100) * 1_000_000 = 10_000 credits
 export const convertCentsToBillingCredits = (cents: number): number =>
   (cents / 100) * DOLLAR_TO_CREDIT_MULTIPLIER;
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.ts
index ec5f6cedb39..3123d09ae8c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.ts
@@ -8,7 +8,7 @@ import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-
 import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
 import { FileUploadModule } from 'src/engine/core-modules/file/file-upload/file-upload.module';
 import { FileModule } from 'src/engine/core-modules/file/file.module';
-import { SkillsModule } from 'src/engine/core-modules/skills/skills.module';
+import { SkillModule } from 'src/engine/metadata-modules/skill/skill.module';
 import { ThrottlerModule } from 'src/engine/core-modules/throttler/throttler.module';
 import { ToolProviderModule } from 'src/engine/core-modules/tool-provider/tool-provider.module';
 import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
@@ -44,7 +44,7 @@ import { ChatExecutionService } from './services/chat-execution.service';
     FileUploadModule,
     FileModule,
     PermissionsModule,
-    SkillsModule,
+    SkillModule,
     WorkspaceCacheStorageModule,
     WorkspaceCacheModule,
     WorkspaceDomainsModule,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/constants/chat-system-prompts.const.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/constants/chat-system-prompts.const.ts
index ddee2548a88..1000419f8ff 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/constants/chat-system-prompts.const.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/constants/chat-system-prompts.const.ts
@@ -10,6 +10,12 @@ Tool usage strategy:
 - Don't give up after first failure - be persistent
 - Validate assumptions before making changes
 
+Database vs HTTP tools:
+- Use database tools (find_*, create_*, update_*, delete_*) for ALL Twenty CRM data operations
+- NEVER guess or construct API URLs - always use the appropriate database tool
+- The \`http_request\` tool is ONLY for external third-party APIs (not for Twenty's own data)
+- If you need to look up a record, load and use the corresponding find_one_* or find_many_* tool
+
 Error recovery:
 - Analyze error messages to understand what went wrong
 - Adjust parameters or try different tools
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.ts
index 661dc9e77da..188d4499f5b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.ts
@@ -17,7 +17,6 @@ import { getAppPath } from 'twenty-shared/utils';
 import { type CodeExecutionStreamEmitter } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider.interface';
 
 import { WorkspaceDomainsService } from 'src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service';
-import { SkillsService } from 'src/engine/core-modules/skills/skills.service';
 import {
   type ToolIndexEntry,
   ToolRegistryService,
@@ -46,6 +45,8 @@ import {
 } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
 import { AI_TELEMETRY_CONFIG } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-telemetry.const';
 import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';
+import { type FlatSkill } from 'src/engine/metadata-modules/flat-skill/types/flat-skill.type';
+import { SkillService } from 'src/engine/metadata-modules/skill/skill.service';
 
 export type ChatExecutionOptions = {
   workspace: WorkspaceEntity;
@@ -61,7 +62,7 @@ export type ChatExecutionResult = {
   modelConfig: AIModelConfig;
 };
 
-const COMMON_PRELOAD_TOOLS = ['http_request', 'search_help_center'];
+const COMMON_PRELOAD_TOOLS = ['search_help_center'];
 
 @Injectable()
 export class ChatExecutionService {
@@ -69,7 +70,7 @@ export class ChatExecutionService {
 
   constructor(
     private readonly toolRegistry: ToolRegistryService,
-    private readonly skillsService: SkillsService,
+    private readonly skillService: SkillService,
     private readonly aiModelRegistryService: AiModelRegistryService,
     private readonly aiBillingService: AIBillingService,
     private readonly agentActorContextService: AgentActorContextService,
@@ -108,7 +109,9 @@ export class ChatExecutionService {
       { userId, userWorkspaceId },
     );
 
-    const skillCatalog = this.skillsService.getAllSkills();
+    const skillCatalog = await this.skillService.findAllFlatSkills(
+      workspace.id,
+    );
 
     this.logger.log(
       `Built tool catalog with ${toolCatalog.length} tools, ${skillCatalog.length} skills available`,
@@ -150,7 +153,7 @@ export class ChatExecutionService {
         },
       ),
       [LOAD_SKILL_TOOL_NAME]: createLoadSkillTool((skillNames) =>
-        this.skillsService.getSkillsByNames(skillNames),
+        this.skillService.findFlatSkillsByNames(skillNames, workspace.id),
       ),
     };
 
@@ -283,7 +286,7 @@ export class ChatExecutionService {
 
   private buildSystemPrompt(
     toolCatalog: ToolIndexEntry[],
-    skillCatalog: Array<{ name: string; label: string; description: string }>,
+    skillCatalog: FlatSkill[],
     preloadedTools: string[],
     contextString?: string,
     storedFiles?: Array<{ filename: string; storagePath: string; url: string }>,
@@ -333,15 +336,15 @@ ${filesJson}
 In your Python code, access files at \`/home/user/{filename}\`.`;
   }
 
-  private buildSkillCatalogSection(
-    skillCatalog: Array<{ name: string; label: string; description: string }>,
-  ): string {
+  private buildSkillCatalogSection(skillCatalog: FlatSkill[]): string {
     if (skillCatalog.length === 0) {
       return '';
     }
 
     const skillsList = skillCatalog
-      .map((skill) => `- \`${skill.name}\`: ${skill.description}`)
+      .map(
+        (skill) => `- \`${skill.name}\`: ${skill.description ?? skill.label}`,
+      )
       .join('\n');
 
     return `
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/dollar-to-credit-multiplier.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/dollar-to-credit-multiplier.ts
index 866dfb27b5b..90837ee9f14 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/dollar-to-credit-multiplier.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/dollar-to-credit-multiplier.ts
@@ -1,2 +1,2 @@
-// Configuration: $0.00001 = 1 credit
-export const DOLLAR_TO_CREDIT_MULTIPLIER = 1000000; // 1 / 0.000001 = 1000000 credits per dollar
+// Configuration: $0.00_001 = 1 credit
+export const DOLLAR_TO_CREDIT_MULTIPLIER = 1_000_000; // 1 / 0.00_0001 = 1_000_000 credits per dollar
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-flat-entity-properties-to-compare-and-stringify.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-flat-entity-properties-to-compare-and-stringify.constant.ts
index b797cf9a2be..b12806ba062 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-flat-entity-properties-to-compare-and-stringify.constant.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-flat-entity-properties-to-compare-and-stringify.constant.ts
@@ -13,6 +13,7 @@ import { FLAT_ROLE_TARGET_EDITABLE_PROPERTIES } from 'src/engine/metadata-module
 import { FLAT_ROLE_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/flat-role/constants/flat-role-editable-properties.constant';
 import { FLAT_ROW_LEVEL_PERMISSION_PREDICATE_GROUP_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/flat-row-level-permission-predicate-group/constants/flat-row-level-permission-predicate-group-editable-properties.constant';
 import { FLAT_ROW_LEVEL_PERMISSION_PREDICATE_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/flat-row-level-permission-predicate/constants/flat-row-level-permission-predicate-editable-properties.constant';
+import { FLAT_SKILL_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/flat-skill/constants/flat-skill-editable-properties.constant';
 import { FLAT_VIEW_FIELD_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/flat-view-field/constants/flat-view-field-editable-properties.constant';
 import { FLAT_VIEW_FILTER_GROUP_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/flat-view-filter-group/constants/flat-view-filter-group-editable-properties.constant';
 import { FLAT_VIEW_FILTER_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/flat-view-filter/constants/flat-view-filter-editable-properties.constant';
@@ -135,6 +136,10 @@ export const ALL_FLAT_ENTITY_PROPERTIES_TO_COMPARE_AND_STRINGIFY = {
     ],
     propertiesToStringify: [],
   },
+  skill: {
+    propertiesToCompare: [...FLAT_SKILL_EDITABLE_PROPERTIES],
+    propertiesToStringify: [],
+  },
   rowLevelPermissionPredicate: {
     propertiesToCompare: [
       ...FLAT_ROW_LEVEL_PERMISSION_PREDICATE_EDITABLE_PROPERTIES,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-many-to-one-relations.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-many-to-one-relations.constant.ts
index 28cfe61a5cc..50fa32fe12a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-many-to-one-relations.constant.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-many-to-one-relations.constant.ts
@@ -113,6 +113,7 @@ export const ALL_METADATA_RELATED_METADATA_BY_FOREIGN_KEY = {
     },
   },
   agent: {},
+  skill: {},
   pageLayout: {},
   pageLayoutWidget: {
     pageLayoutTabId: {
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-relations-properties.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-relations-properties.constant.ts
index 3b3484bf8e5..f6829e4ca8a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-relations-properties.constant.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-relations-properties.constant.ts
@@ -8,6 +8,10 @@ export const ALL_METADATA_RELATION_PROPERTIES = {
     workspace: true,
     application: true,
   },
+  skill: {
+    workspace: true,
+    application: true,
+  },
   fieldMetadata: {
     relationTargetFieldMetadata: true,
     relationTargetObjectMetadata: true,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-required-metadata-for-validation.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-required-metadata-for-validation.constant.ts
index bcb6f00ec50..a34a72ed3ad 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-required-metadata-for-validation.constant.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-required-metadata-for-validation.constant.ts
@@ -62,6 +62,7 @@ export const ALL_METADATA_REQUIRED_METADATA_FOR_VALIDATION = {
   agent: {
     role: true,
   },
+  skill: {},
   pageLayout: {},
   pageLayoutTab: {
     pageLayout: true,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.ts
index 4bebba807da..a17752eb0d0 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.ts
@@ -13,6 +13,7 @@ import { type FlatPageLayoutWidget } from 'src/engine/metadata-modules/flat-page
 import { type FlatPageLayout } from 'src/engine/metadata-modules/flat-page-layout/types/flat-page-layout.type';
 import { type FlatRoleTarget } from 'src/engine/metadata-modules/flat-role-target/types/flat-role-target.type';
 import { type FlatRole } from 'src/engine/metadata-modules/flat-role/types/flat-role.type';
+import { type FlatSkill } from 'src/engine/metadata-modules/flat-skill/types/flat-skill.type';
 import { type FlatViewField } from 'src/engine/metadata-modules/flat-view-field/types/flat-view-field.type';
 import { type FlatViewFilterGroup } from 'src/engine/metadata-modules/flat-view-filter-group/types/flat-view-filter-group.type';
 import { type FlatViewFilter } from 'src/engine/metadata-modules/flat-view-filter/types/flat-view-filter.type';
@@ -33,6 +34,7 @@ import { type FlatRowLevelPermissionPredicateGroup } from 'src/engine/metadata-m
 import { type FlatRowLevelPermissionPredicate } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate.type';
 import { type ServerlessFunctionEntity } from 'src/engine/metadata-modules/serverless-function/serverless-function.entity';
 import { type FlatServerlessFunction } from 'src/engine/metadata-modules/serverless-function/types/flat-serverless-function.type';
+import { type SkillEntity } from 'src/engine/metadata-modules/skill/entities/skill.entity';
 import { type ViewFieldEntity } from 'src/engine/metadata-modules/view-field/entities/view-field.entity';
 import { type ViewFilterGroupEntity } from 'src/engine/metadata-modules/view-filter-group/entities/view-filter-group.entity';
 import { type ViewFilterEntity } from 'src/engine/metadata-modules/view-filter/entities/view-filter.entity';
@@ -113,6 +115,11 @@ import {
   type DeleteServerlessFunctionAction,
   type UpdateServerlessFunctionAction,
 } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/serverless-function/types/workspace-migration-serverless-function-action-v2.type';
+import {
+  type CreateSkillAction,
+  type DeleteSkillAction,
+  type UpdateSkillAction,
+} from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/skill/types/workspace-migration-v2-skill-action.type';
 import {
   type CreateViewFieldAction,
   type DeleteViewFieldAction,
@@ -295,6 +302,15 @@ export type AllFlatEntityTypesByMetadataName = {
     flatEntity: FlatAgent;
     entity: AgentEntity;
   };
+  skill: {
+    actions: {
+      created: CreateSkillAction;
+      updated: UpdateSkillAction;
+      deleted: DeleteSkillAction;
+    };
+    flatEntity: FlatSkill;
+    entity: SkillEntity;
+  };
   pageLayout: {
     actions: {
       created: CreatePageLayoutAction;
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-skill/constants/flat-skill-editable-properties.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-skill/constants/flat-skill-editable-properties.constant.ts
new file mode 100644
index 00000000000..a7dfdabb003
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-skill/constants/flat-skill-editable-properties.constant.ts
@@ -0,0 +1,10 @@
+import { type FlatSkill } from 'src/engine/metadata-modules/flat-skill/types/flat-skill.type';
+
+export const FLAT_SKILL_EDITABLE_PROPERTIES = [
+  'name',
+  'label',
+  'icon',
+  'description',
+  'content',
+  'isActive',
+] as const satisfies (keyof FlatSkill)[];
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-skill/flat-skill.module.ts b/packages/twenty-server/src/engine/metadata-modules/flat-skill/flat-skill.module.ts
new file mode 100644
index 00000000000..1c57c2d326a
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-skill/flat-skill.module.ts
@@ -0,0 +1,16 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
+import { WorkspaceFlatSkillMapCacheService } from 'src/engine/metadata-modules/flat-skill/services/workspace-flat-skill-map-cache.service';
+import { SkillEntity } from 'src/engine/metadata-modules/skill/entities/skill.entity';
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([SkillEntity]),
+    WorkspaceManyOrAllFlatEntityMapsCacheModule,
+  ],
+  providers: [WorkspaceFlatSkillMapCacheService],
+  exports: [WorkspaceFlatSkillMapCacheService],
+})
+export class FlatSkillModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-skill/services/workspace-flat-skill-map-cache.service.ts b/packages/twenty-server/src/engine/metadata-modules/flat-skill/services/workspace-flat-skill-map-cache.service.ts
new file mode 100644
index 00000000000..a7e5456429f
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-skill/services/workspace-flat-skill-map-cache.service.ts
@@ -0,0 +1,44 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Repository } from 'typeorm';
+
+import { WorkspaceCacheProvider } from 'src/engine/workspace-cache/interfaces/workspace-cache-provider.service';
+
+import { type FlatSkillMaps } from 'src/engine/metadata-modules/flat-skill/types/flat-skill-maps.type';
+import { transformSkillEntityToFlatSkill } from 'src/engine/metadata-modules/flat-skill/utils/transform-skill-entity-to-flat-skill.util';
+import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
+import { SkillEntity } from 'src/engine/metadata-modules/skill/entities/skill.entity';
+import { WorkspaceCache } from 'src/engine/workspace-cache/decorators/workspace-cache.decorator';
+import { addFlatEntityToFlatEntityMapsThroughMutationOrThrow } from 'src/engine/workspace-manager/workspace-migration-v2/utils/add-flat-entity-to-flat-entity-maps-through-mutation-or-throw.util';
+
+@Injectable()
+@WorkspaceCache('flatSkillMaps')
+export class WorkspaceFlatSkillMapCacheService extends WorkspaceCacheProvider<FlatSkillMaps> {
+  constructor(
+    @InjectRepository(SkillEntity)
+    private readonly skillRepository: Repository<SkillEntity>,
+  ) {
+    super();
+  }
+
+  async computeForCache(workspaceId: string): Promise<FlatSkillMaps> {
+    const skills = await this.skillRepository.find({
+      where: { workspaceId },
+      withDeleted: true,
+    });
+
+    const flatSkillMaps = createEmptyFlatEntityMaps();
+
+    for (const skillEntity of skills) {
+      const flatSkill = transformSkillEntityToFlatSkill(skillEntity);
+
+      addFlatEntityToFlatEntityMapsThroughMutationOrThrow({
+        flatEntity: flatSkill,
+        flatEntityMapsToMutate: flatSkillMaps,
+      });
+    }
+
+    return flatSkillMaps;
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-skill/types/flat-skill-maps.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-skill/types/flat-skill-maps.type.ts
new file mode 100644
index 00000000000..96597d0f526
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-skill/types/flat-skill-maps.type.ts
@@ -0,0 +1,4 @@
+import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
+import { type FlatSkill } from 'src/engine/metadata-modules/flat-skill/types/flat-skill.type';
+
+export type FlatSkillMaps = FlatEntityMaps<FlatSkill>;
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-skill/types/flat-skill.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-skill/types/flat-skill.type.ts
new file mode 100644
index 00000000000..627d6a19451
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-skill/types/flat-skill.type.ts
@@ -0,0 +1,4 @@
+import { type SkillEntity } from 'src/engine/metadata-modules/skill/entities/skill.entity';
+import { type FlatEntityFrom } from 'src/engine/metadata-modules/flat-entity/types/flat-entity.type';
+
+export type FlatSkill = FlatEntityFrom<SkillEntity>;
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-skill/utils/from-create-skill-input-to-flat-skill-to-create.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-skill/utils/from-create-skill-input-to-flat-skill-to-create.util.ts
new file mode 100644
index 00000000000..86837e30ed9
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-skill/utils/from-create-skill-input-to-flat-skill-to-create.util.ts
@@ -0,0 +1,45 @@
+import { trimAndRemoveDuplicatedWhitespacesFromObjectStringProperties } from 'twenty-shared/utils';
+import { v4 } from 'uuid';
+
+import { type FlatSkill } from 'src/engine/metadata-modules/flat-skill/types/flat-skill.type';
+import { type CreateSkillInput } from 'src/engine/metadata-modules/skill/dtos/create-skill.input';
+
+export const fromCreateSkillInputToFlatSkillToCreate = ({
+  createSkillInput,
+  workspaceId,
+  applicationId,
+}: {
+  createSkillInput: CreateSkillInput;
+  workspaceId: string;
+  applicationId: string;
+}): FlatSkill => {
+  const now = new Date().toISOString();
+
+  const { name, label, icon, description } =
+    trimAndRemoveDuplicatedWhitespacesFromObjectStringProperties(
+      createSkillInput,
+      ['name', 'label', 'icon', 'description'],
+    );
+
+  // Content is markdown - only trim, don't collapse whitespace (preserve newlines)
+  const content = createSkillInput.content.trim();
+
+  const id = v4();
+
+  return {
+    id,
+    standardId: null,
+    name,
+    label,
+    icon: icon ?? null,
+    description: description ?? null,
+    content,
+    isCustom: true,
+    isActive: true,
+    workspaceId,
+    createdAt: now,
+    updatedAt: now,
+    universalIdentifier: id,
+    applicationId,
+  };
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-skill/utils/from-delete-skill-input-to-flat-skill-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-skill/utils/from-delete-skill-input-to-flat-skill-or-throw.util.ts
new file mode 100644
index 00000000000..26e9f07db56
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-skill/utils/from-delete-skill-input-to-flat-skill-or-throw.util.ts
@@ -0,0 +1,38 @@
+import { isDefined } from 'twenty-shared/utils';
+
+import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
+import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
+import { type FlatSkill } from 'src/engine/metadata-modules/flat-skill/types/flat-skill.type';
+import {
+  SkillException,
+  SkillExceptionCode,
+} from 'src/engine/metadata-modules/skill/skill.exception';
+
+export const fromDeleteSkillInputToFlatSkillOrThrow = ({
+  flatSkillMaps,
+  skillId,
+}: {
+  flatSkillMaps: FlatEntityMaps<FlatSkill>;
+  skillId: string;
+}): FlatSkill => {
+  const existingFlatSkill = findFlatEntityByIdInFlatEntityMaps({
+    flatEntityId: skillId,
+    flatEntityMaps: flatSkillMaps,
+  });
+
+  if (!isDefined(existingFlatSkill)) {
+    throw new SkillException(
+      'Skill not found',
+      SkillExceptionCode.SKILL_NOT_FOUND,
+    );
+  }
+
+  if (!existingFlatSkill.isCustom) {
+    throw new SkillException(
+      'Cannot delete standard skill',
+      SkillExceptionCode.SKILL_IS_STANDARD,
+    );
+  }
+
+  return existingFlatSkill;
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-skill/utils/from-flat-skill-to-skill-dto.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-skill/utils/from-flat-skill-to-skill-dto.util.ts
new file mode 100644
index 00000000000..cf51da53e40
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-skill/utils/from-flat-skill-to-skill-dto.util.ts
@@ -0,0 +1,18 @@
+import { type FlatSkill } from 'src/engine/metadata-modules/flat-skill/types/flat-skill.type';
+import { type SkillDTO } from 'src/engine/metadata-modules/skill/dtos/skill.dto';
+
+export const fromFlatSkillToSkillDto = (flatSkill: FlatSkill): SkillDTO => ({
+  id: flatSkill.id,
+  standardId: flatSkill.standardId,
+  name: flatSkill.name,
+  label: flatSkill.label,
+  icon: flatSkill.icon ?? undefined,
+  description: flatSkill.description ?? undefined,
+  content: flatSkill.content,
+  isCustom: flatSkill.isCustom,
+  isActive: flatSkill.isActive,
+  workspaceId: flatSkill.workspaceId,
+  applicationId: flatSkill.applicationId ?? undefined,
+  createdAt: new Date(flatSkill.createdAt),
+  updatedAt: new Date(flatSkill.updatedAt),
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-skill/utils/from-update-skill-input-to-flat-skill-to-update-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-skill/utils/from-update-skill-input-to-flat-skill-to-update-or-throw.util.ts
new file mode 100644
index 00000000000..7c2d40b7c0c
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-skill/utils/from-update-skill-input-to-flat-skill-to-update-or-throw.util.ts
@@ -0,0 +1,50 @@
+import { isDefined } from 'twenty-shared/utils';
+
+import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
+import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
+import { FLAT_SKILL_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/flat-skill/constants/flat-skill-editable-properties.constant';
+import { type FlatSkill } from 'src/engine/metadata-modules/flat-skill/types/flat-skill.type';
+import { type UpdateSkillInput } from 'src/engine/metadata-modules/skill/dtos/update-skill.input';
+import {
+  SkillException,
+  SkillExceptionCode,
+} from 'src/engine/metadata-modules/skill/skill.exception';
+import { mergeUpdateInExistingRecord } from 'src/utils/merge-update-in-existing-record.util';
+
+export const fromUpdateSkillInputToFlatSkillToUpdateOrThrow = ({
+  flatSkillMaps,
+  updateSkillInput,
+}: {
+  flatSkillMaps: FlatEntityMaps<FlatSkill>;
+  updateSkillInput: UpdateSkillInput;
+}): FlatSkill => {
+  const existingFlatSkill = findFlatEntityByIdInFlatEntityMaps({
+    flatEntityId: updateSkillInput.id,
+    flatEntityMaps: flatSkillMaps,
+  });
+
+  if (!isDefined(existingFlatSkill)) {
+    throw new SkillException(
+      'Skill not found',
+      SkillExceptionCode.SKILL_NOT_FOUND,
+    );
+  }
+
+  if (!existingFlatSkill.isCustom) {
+    throw new SkillException(
+      'Cannot update standard skill',
+      SkillExceptionCode.SKILL_IS_STANDARD,
+    );
+  }
+
+  const { id: _id, ...updates } = updateSkillInput;
+
+  return {
+    ...mergeUpdateInExistingRecord({
+      existing: existingFlatSkill,
+      properties: [...FLAT_SKILL_EDITABLE_PROPERTIES],
+      update: updates,
+    }),
+    updatedAt: new Date().toISOString(),
+  };
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-skill/utils/transform-skill-entity-to-flat-skill.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-skill/utils/transform-skill-entity-to-flat-skill.util.ts
new file mode 100644
index 00000000000..80f2cf10704
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-skill/utils/transform-skill-entity-to-flat-skill.util.ts
@@ -0,0 +1,23 @@
+import { type SkillEntity } from 'src/engine/metadata-modules/skill/entities/skill.entity';
+import { type FlatSkill } from 'src/engine/metadata-modules/flat-skill/types/flat-skill.type';
+
+export const transformSkillEntityToFlatSkill = (
+  skillEntity: SkillEntity,
+): FlatSkill => {
+  return {
+    createdAt: skillEntity.createdAt.toISOString(),
+    updatedAt: skillEntity.updatedAt.toISOString(),
+    id: skillEntity.id,
+    standardId: skillEntity.standardId,
+    name: skillEntity.name,
+    label: skillEntity.label,
+    icon: skillEntity.icon,
+    description: skillEntity.description,
+    content: skillEntity.content,
+    workspaceId: skillEntity.workspaceId,
+    isCustom: skillEntity.isCustom,
+    isActive: skillEntity.isActive,
+    universalIdentifier: skillEntity.standardId || skillEntity.id,
+    applicationId: skillEntity.applicationId,
+  };
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/metadata-engine.module.ts b/packages/twenty-server/src/engine/metadata-modules/metadata-engine.module.ts
index 476096a3604..948e8746d13 100644
--- a/packages/twenty-server/src/engine/metadata-modules/metadata-engine.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/metadata-engine.module.ts
@@ -15,6 +15,7 @@ import { RouteTriggerModule } from 'src/engine/metadata-modules/route-trigger/ro
 import { SearchFieldMetadataModule } from 'src/engine/metadata-modules/search-field-metadata/search-field-metadata.module';
 import { ServerlessFunctionLayerModule } from 'src/engine/metadata-modules/serverless-function-layer/serverless-function-layer.module';
 import { ServerlessFunctionModule } from 'src/engine/metadata-modules/serverless-function/serverless-function.module';
+import { SkillModule } from 'src/engine/metadata-modules/skill/skill.module';
 import { ViewModule } from 'src/engine/metadata-modules/view/view.module';
 import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
 import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
@@ -27,6 +28,7 @@ import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-
     SearchFieldMetadataModule,
     ServerlessFunctionModule,
     ServerlessFunctionLayerModule,
+    SkillModule,
     AiAgentModule,
     AiAgentMonitorModule,
     AiChatModule,
@@ -47,6 +49,7 @@ import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-
     ObjectMetadataModule,
     SearchFieldMetadataModule,
     ServerlessFunctionModule,
+    SkillModule,
     AiAgentModule,
     AiChatModule,
     ViewModule,
diff --git a/packages/twenty-server/src/engine/metadata-modules/skill/dtos/create-skill.input.ts b/packages/twenty-server/src/engine/metadata-modules/skill/dtos/create-skill.input.ts
new file mode 100644
index 00000000000..62a654af89d
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/skill/dtos/create-skill.input.ts
@@ -0,0 +1,31 @@
+import { Field, InputType } from '@nestjs/graphql';
+
+import { IsNotEmpty, IsOptional, IsString } from 'class-validator';
+
+@InputType()
+export class CreateSkillInput {
+  @IsString()
+  @IsNotEmpty()
+  @Field()
+  name: string;
+
+  @IsString()
+  @IsNotEmpty()
+  @Field()
+  label: string;
+
+  @IsString()
+  @IsOptional()
+  @Field({ nullable: true })
+  icon?: string;
+
+  @IsString()
+  @IsOptional()
+  @Field({ nullable: true })
+  description?: string;
+
+  @IsString()
+  @IsNotEmpty()
+  @Field()
+  content: string;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/skill/dtos/skill.dto.ts b/packages/twenty-server/src/engine/metadata-modules/skill/dtos/skill.dto.ts
new file mode 100644
index 00000000000..1889409f079
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/skill/dtos/skill.dto.ts
@@ -0,0 +1,65 @@
+import { Field, HideField, ObjectType } from '@nestjs/graphql';
+
+import {
+  IsBoolean,
+  IsDateString,
+  IsNotEmpty,
+  IsString,
+  IsUUID,
+} from 'class-validator';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+@ObjectType('Skill')
+export class SkillDTO {
+  @IsUUID()
+  @IsNotEmpty()
+  @Field(() => UUIDScalarType)
+  id: string;
+
+  @Field(() => UUIDScalarType, { nullable: true })
+  standardId?: string | null;
+
+  @IsString()
+  @Field()
+  name: string;
+
+  @IsString()
+  @Field()
+  label: string;
+
+  @IsString()
+  @Field({ nullable: true })
+  icon?: string;
+
+  @IsString()
+  @Field({ nullable: true })
+  description?: string;
+
+  @IsString()
+  @IsNotEmpty()
+  @Field()
+  content: string;
+
+  @IsBoolean()
+  @Field()
+  isCustom: boolean;
+
+  @IsBoolean()
+  @Field()
+  isActive: boolean;
+
+  @HideField()
+  workspaceId: string;
+
+  @Field(() => UUIDScalarType, { nullable: true })
+  applicationId?: string;
+
+  @IsDateString()
+  @Field()
+  createdAt: Date;
+
+  @IsDateString()
+  @Field()
+  updatedAt: Date;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/skill/dtos/update-skill.input.ts b/packages/twenty-server/src/engine/metadata-modules/skill/dtos/update-skill.input.ts
new file mode 100644
index 00000000000..60e6482ae95
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/skill/dtos/update-skill.input.ts
@@ -0,0 +1,49 @@
+import { Field, InputType } from '@nestjs/graphql';
+
+import {
+  IsBoolean,
+  IsNotEmpty,
+  IsOptional,
+  IsString,
+  IsUUID,
+} from 'class-validator';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+@InputType()
+export class UpdateSkillInput {
+  @IsUUID()
+  @IsNotEmpty()
+  @Field(() => UUIDScalarType)
+  id: string;
+
+  @IsString()
+  @IsOptional()
+  @Field({ nullable: true })
+  name?: string;
+
+  @IsString()
+  @IsOptional()
+  @Field({ nullable: true })
+  label?: string;
+
+  @IsString()
+  @IsOptional()
+  @Field({ nullable: true })
+  icon?: string;
+
+  @IsString()
+  @IsOptional()
+  @Field({ nullable: true })
+  description?: string;
+
+  @IsString()
+  @IsOptional()
+  @Field({ nullable: true })
+  content?: string;
+
+  @IsBoolean()
+  @IsOptional()
+  @Field({ nullable: true })
+  isActive?: boolean;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/skill/entities/skill.entity.ts b/packages/twenty-server/src/engine/metadata-modules/skill/entities/skill.entity.ts
new file mode 100644
index 00000000000..3edd8b78a9c
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/skill/entities/skill.entity.ts
@@ -0,0 +1,54 @@
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn,
+} from 'typeorm';
+
+import { SyncableEntity } from 'src/engine/workspace-manager/workspace-sync/types/syncable-entity.interface';
+
+@Entity('skill')
+@Index('IDX_SKILL_ID_IS_ACTIVE', ['id', 'isActive'])
+@Index('IDX_SKILL_NAME_WORKSPACE_ID_UNIQUE', ['name', 'workspaceId'], {
+  unique: true,
+  where: '"isActive" = true',
+})
+export class SkillEntity
+  extends SyncableEntity
+  implements Required<SkillEntity>
+{
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @Column({ nullable: true, type: 'uuid' })
+  standardId: string | null;
+
+  @Column({ nullable: false })
+  name: string;
+
+  @Column({ nullable: false })
+  label: string;
+
+  @Column({ nullable: true, type: 'varchar' })
+  icon: string | null;
+
+  @Column({ nullable: true, type: 'text' })
+  description: string | null;
+
+  @Column({ nullable: false, type: 'text' })
+  content: string;
+
+  @Column({ default: false })
+  isCustom: boolean;
+
+  @Column({ default: true })
+  isActive: boolean;
+
+  @CreateDateColumn({ type: 'timestamptz' })
+  createdAt: Date;
+
+  @UpdateDateColumn({ type: 'timestamptz' })
+  updatedAt: Date;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/skill/interceptors/skill-graphql-api-exception.interceptor.ts b/packages/twenty-server/src/engine/metadata-modules/skill/interceptors/skill-graphql-api-exception.interceptor.ts
new file mode 100644
index 00000000000..58699bee616
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/skill/interceptors/skill-graphql-api-exception.interceptor.ts
@@ -0,0 +1,20 @@
+import {
+  type CallHandler,
+  type ExecutionContext,
+  Injectable,
+  type NestInterceptor,
+} from '@nestjs/common';
+
+import { type Observable, catchError } from 'rxjs';
+
+import { skillGraphqlApiExceptionHandler } from 'src/engine/metadata-modules/skill/utils/skill-graphql-api-exception-handler.util';
+
+@Injectable()
+export class SkillGraphqlApiExceptionInterceptor implements NestInterceptor {
+  intercept(
+    _context: ExecutionContext,
+    next: CallHandler,
+  ): Observable<unknown> {
+    return next.handle().pipe(catchError(skillGraphqlApiExceptionHandler));
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/skill/skill.exception.ts b/packages/twenty-server/src/engine/metadata-modules/skill/skill.exception.ts
new file mode 100644
index 00000000000..ee48ea7b615
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/skill/skill.exception.ts
@@ -0,0 +1,40 @@
+import { type MessageDescriptor } from '@lingui/core';
+import { msg } from '@lingui/core/macro';
+import { assertUnreachable } from 'twenty-shared/utils';
+
+import { CustomException } from 'src/utils/custom-exception';
+
+export enum SkillExceptionCode {
+  SKILL_NOT_FOUND = 'SKILL_NOT_FOUND',
+  SKILL_ALREADY_EXISTS = 'SKILL_ALREADY_EXISTS',
+  SKILL_IS_STANDARD = 'SKILL_IS_STANDARD',
+  INVALID_SKILL_INPUT = 'INVALID_SKILL_INPUT',
+}
+
+const getSkillExceptionUserFriendlyMessage = (code: SkillExceptionCode) => {
+  switch (code) {
+    case SkillExceptionCode.SKILL_NOT_FOUND:
+      return msg`Skill not found.`;
+    case SkillExceptionCode.SKILL_ALREADY_EXISTS:
+      return msg`A skill with this name already exists.`;
+    case SkillExceptionCode.SKILL_IS_STANDARD:
+      return msg`Standard skills cannot be modified.`;
+    case SkillExceptionCode.INVALID_SKILL_INPUT:
+      return msg`Invalid skill input.`;
+    default:
+      assertUnreachable(code);
+  }
+};
+
+export class SkillException extends CustomException<SkillExceptionCode> {
+  constructor(
+    message: string,
+    code: SkillExceptionCode,
+    { userFriendlyMessage }: { userFriendlyMessage?: MessageDescriptor } = {},
+  ) {
+    super(message, code, {
+      userFriendlyMessage:
+        userFriendlyMessage ?? getSkillExceptionUserFriendlyMessage(code),
+    });
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/skill/skill.module.ts b/packages/twenty-server/src/engine/metadata-modules/skill/skill.module.ts
new file mode 100644
index 00000000000..00e1477a38f
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/skill/skill.module.ts
@@ -0,0 +1,29 @@
+import { Module } from '@nestjs/common';
+
+import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
+import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
+import { FlatSkillModule } from 'src/engine/metadata-modules/flat-skill/flat-skill.module';
+import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
+import { SkillGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/skill/interceptors/skill-graphql-api-exception.interceptor';
+import { SkillResolver } from 'src/engine/metadata-modules/skill/skill.resolver';
+import { SkillService } from 'src/engine/metadata-modules/skill/skill.service';
+import { WorkspaceMigrationBuilderGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration-v2/interceptors/workspace-migration-builder-graphql-api-exception.interceptor';
+import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-v2.module';
+
+@Module({
+  imports: [
+    WorkspaceManyOrAllFlatEntityMapsCacheModule,
+    WorkspaceMigrationV2Module,
+    ApplicationModule,
+    PermissionsModule,
+    FlatSkillModule,
+  ],
+  providers: [
+    SkillService,
+    SkillResolver,
+    SkillGraphqlApiExceptionInterceptor,
+    WorkspaceMigrationBuilderGraphqlApiExceptionInterceptor,
+  ],
+  exports: [SkillService],
+})
+export class SkillModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/skill/skill.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/skill/skill.resolver.ts
new file mode 100644
index 00000000000..e4f9ba151f0
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/skill/skill.resolver.ts
@@ -0,0 +1,81 @@
+import { UseGuards, UseInterceptors } from '@nestjs/common';
+import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+
+import { PermissionFlagType } from 'twenty-shared/constants';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
+import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
+import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { CreateSkillInput } from 'src/engine/metadata-modules/skill/dtos/create-skill.input';
+import { SkillDTO } from 'src/engine/metadata-modules/skill/dtos/skill.dto';
+import { UpdateSkillInput } from 'src/engine/metadata-modules/skill/dtos/update-skill.input';
+import { SkillGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/skill/interceptors/skill-graphql-api-exception.interceptor';
+import { SkillService } from 'src/engine/metadata-modules/skill/skill.service';
+import { WorkspaceMigrationBuilderGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration-v2/interceptors/workspace-migration-builder-graphql-api-exception.interceptor';
+
+@UseGuards(WorkspaceAuthGuard, SettingsPermissionGuard(PermissionFlagType.AI))
+@UseInterceptors(
+  WorkspaceMigrationBuilderGraphqlApiExceptionInterceptor,
+  SkillGraphqlApiExceptionInterceptor,
+)
+@Resolver(() => SkillDTO)
+export class SkillResolver {
+  constructor(private readonly skillService: SkillService) {}
+
+  @Query(() => [SkillDTO])
+  async skills(
+    @AuthWorkspace() workspace: WorkspaceEntity,
+  ): Promise<SkillDTO[]> {
+    return this.skillService.findAll(workspace.id);
+  }
+
+  @Query(() => SkillDTO, { nullable: true })
+  async skill(
+    @Args('id', { type: () => UUIDScalarType }) id: string,
+    @AuthWorkspace() workspace: WorkspaceEntity,
+  ): Promise<SkillDTO | null> {
+    return this.skillService.findById(id, workspace.id);
+  }
+
+  @Mutation(() => SkillDTO)
+  async createSkill(
+    @Args('input') input: CreateSkillInput,
+    @AuthWorkspace() workspace: WorkspaceEntity,
+  ): Promise<SkillDTO> {
+    return this.skillService.create(input, workspace.id);
+  }
+
+  @Mutation(() => SkillDTO)
+  async updateSkill(
+    @Args('input') input: UpdateSkillInput,
+    @AuthWorkspace() workspace: WorkspaceEntity,
+  ): Promise<SkillDTO> {
+    return this.skillService.update(input, workspace.id);
+  }
+
+  @Mutation(() => SkillDTO)
+  async deleteSkill(
+    @Args('id', { type: () => UUIDScalarType }) id: string,
+    @AuthWorkspace() workspace: WorkspaceEntity,
+  ): Promise<SkillDTO> {
+    return this.skillService.delete(id, workspace.id);
+  }
+
+  @Mutation(() => SkillDTO)
+  async activateSkill(
+    @Args('id', { type: () => UUIDScalarType }) id: string,
+    @AuthWorkspace() workspace: WorkspaceEntity,
+  ): Promise<SkillDTO> {
+    return this.skillService.activate(id, workspace.id);
+  }
+
+  @Mutation(() => SkillDTO)
+  async deactivateSkill(
+    @Args('id', { type: () => UUIDScalarType }) id: string,
+    @AuthWorkspace() workspace: WorkspaceEntity,
+  ): Promise<SkillDTO> {
+    return this.skillService.deactivate(id, workspace.id);
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/skill/skill.service.ts b/packages/twenty-server/src/engine/metadata-modules/skill/skill.service.ts
new file mode 100644
index 00000000000..6412fce1b92
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/skill/skill.service.ts
@@ -0,0 +1,381 @@
+import { Injectable } from '@nestjs/common';
+
+import { isDefined } from 'twenty-shared/utils';
+
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
+import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
+import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
+import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
+import { type FlatSkill } from 'src/engine/metadata-modules/flat-skill/types/flat-skill.type';
+import { fromCreateSkillInputToFlatSkillToCreate } from 'src/engine/metadata-modules/flat-skill/utils/from-create-skill-input-to-flat-skill-to-create.util';
+import { fromDeleteSkillInputToFlatSkillOrThrow } from 'src/engine/metadata-modules/flat-skill/utils/from-delete-skill-input-to-flat-skill-or-throw.util';
+import { fromFlatSkillToSkillDto } from 'src/engine/metadata-modules/flat-skill/utils/from-flat-skill-to-skill-dto.util';
+import { fromUpdateSkillInputToFlatSkillToUpdateOrThrow } from 'src/engine/metadata-modules/flat-skill/utils/from-update-skill-input-to-flat-skill-to-update-or-throw.util';
+import { type CreateSkillInput } from 'src/engine/metadata-modules/skill/dtos/create-skill.input';
+import { type SkillDTO } from 'src/engine/metadata-modules/skill/dtos/skill.dto';
+import { type UpdateSkillInput } from 'src/engine/metadata-modules/skill/dtos/update-skill.input';
+import {
+  SkillException,
+  SkillExceptionCode,
+} from 'src/engine/metadata-modules/skill/skill.exception';
+import { WorkspaceMigrationBuilderExceptionV2 } from 'src/engine/workspace-manager/workspace-migration-v2/exceptions/workspace-migration-builder-exception-v2';
+import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration-v2/services/workspace-migration-validate-build-and-run-service';
+
+@Injectable()
+export class SkillService {
+  constructor(
+    private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,
+    private readonly workspaceManyOrAllFlatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
+    private readonly applicationService: ApplicationService,
+  ) {}
+
+  async findAll(workspaceId: string): Promise<SkillDTO[]> {
+    const { flatSkillMaps } =
+      await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+        {
+          workspaceId,
+          flatMapsKeys: ['flatSkillMaps'],
+        },
+      );
+
+    return Object.values(flatSkillMaps.byId)
+      .filter(isDefined)
+      .sort((a, b) => a.label.localeCompare(b.label))
+      .map(fromFlatSkillToSkillDto);
+  }
+
+  async findById(id: string, workspaceId: string): Promise<SkillDTO | null> {
+    const { flatSkillMaps } =
+      await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+        {
+          workspaceId,
+          flatMapsKeys: ['flatSkillMaps'],
+        },
+      );
+
+    const flatSkill = findFlatEntityByIdInFlatEntityMaps({
+      flatEntityId: id,
+      flatEntityMaps: flatSkillMaps,
+    });
+
+    if (!isDefined(flatSkill)) {
+      return null;
+    }
+
+    return fromFlatSkillToSkillDto(flatSkill);
+  }
+
+  async create(
+    input: CreateSkillInput,
+    workspaceId: string,
+  ): Promise<SkillDTO> {
+    const { workspaceCustomFlatApplication } =
+      await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(
+        { workspaceId },
+      );
+
+    const flatSkillToCreate = fromCreateSkillInputToFlatSkillToCreate({
+      createSkillInput: input,
+      workspaceId,
+      applicationId: workspaceCustomFlatApplication.id,
+    });
+
+    const validateAndBuildResult =
+      await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
+        {
+          allFlatEntityOperationByMetadataName: {
+            skill: {
+              flatEntityToCreate: [flatSkillToCreate],
+              flatEntityToDelete: [],
+              flatEntityToUpdate: [],
+            },
+          },
+          workspaceId,
+          isSystemBuild: false,
+        },
+      );
+
+    if (isDefined(validateAndBuildResult)) {
+      throw new WorkspaceMigrationBuilderExceptionV2(
+        validateAndBuildResult,
+        'Multiple validation errors occurred while creating skill',
+      );
+    }
+
+    const { flatSkillMaps: recomputedFlatSkillMaps } =
+      await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+        {
+          workspaceId,
+          flatMapsKeys: ['flatSkillMaps'],
+        },
+      );
+
+    return fromFlatSkillToSkillDto(
+      findFlatEntityByIdInFlatEntityMapsOrThrow({
+        flatEntityId: flatSkillToCreate.id,
+        flatEntityMaps: recomputedFlatSkillMaps,
+      }),
+    );
+  }
+
+  async update(
+    input: UpdateSkillInput,
+    workspaceId: string,
+  ): Promise<SkillDTO> {
+    const { flatSkillMaps: existingFlatSkillMaps } =
+      await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+        {
+          workspaceId,
+          flatMapsKeys: ['flatSkillMaps'],
+        },
+      );
+
+    const flatSkillToUpdate = fromUpdateSkillInputToFlatSkillToUpdateOrThrow({
+      flatSkillMaps: existingFlatSkillMaps,
+      updateSkillInput: input,
+    });
+
+    const validateAndBuildResult =
+      await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
+        {
+          allFlatEntityOperationByMetadataName: {
+            skill: {
+              flatEntityToCreate: [],
+              flatEntityToDelete: [],
+              flatEntityToUpdate: [flatSkillToUpdate],
+            },
+          },
+          workspaceId,
+          isSystemBuild: false,
+        },
+      );
+
+    if (isDefined(validateAndBuildResult)) {
+      throw new WorkspaceMigrationBuilderExceptionV2(
+        validateAndBuildResult,
+        'Multiple validation errors occurred while updating skill',
+      );
+    }
+
+    const { flatSkillMaps: recomputedFlatSkillMaps } =
+      await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+        {
+          workspaceId,
+          flatMapsKeys: ['flatSkillMaps'],
+        },
+      );
+
+    return fromFlatSkillToSkillDto(
+      findFlatEntityByIdInFlatEntityMapsOrThrow({
+        flatEntityId: input.id,
+        flatEntityMaps: recomputedFlatSkillMaps,
+      }),
+    );
+  }
+
+  async delete(id: string, workspaceId: string): Promise<SkillDTO> {
+    const { flatSkillMaps: existingFlatSkillMaps } =
+      await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+        {
+          workspaceId,
+          flatMapsKeys: ['flatSkillMaps'],
+        },
+      );
+
+    const flatSkillToDelete = fromDeleteSkillInputToFlatSkillOrThrow({
+      flatSkillMaps: existingFlatSkillMaps,
+      skillId: id,
+    });
+
+    const validateAndBuildResult =
+      await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
+        {
+          allFlatEntityOperationByMetadataName: {
+            skill: {
+              flatEntityToCreate: [],
+              flatEntityToDelete: [flatSkillToDelete],
+              flatEntityToUpdate: [],
+            },
+          },
+          workspaceId,
+          isSystemBuild: false,
+        },
+      );
+
+    if (isDefined(validateAndBuildResult)) {
+      throw new WorkspaceMigrationBuilderExceptionV2(
+        validateAndBuildResult,
+        'Multiple validation errors occurred while deleting skill',
+      );
+    }
+
+    return fromFlatSkillToSkillDto(flatSkillToDelete);
+  }
+
+  async findAllFlatSkills(workspaceId: string): Promise<FlatSkill[]> {
+    const { flatSkillMaps } =
+      await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+        {
+          workspaceId,
+          flatMapsKeys: ['flatSkillMaps'],
+        },
+      );
+
+    return Object.values(flatSkillMaps.byId)
+      .filter(isDefined)
+      .filter((flatSkill) => flatSkill.isActive)
+      .sort((a, b) => a.label.localeCompare(b.label));
+  }
+
+  async findFlatSkillsByNames(
+    names: string[],
+    workspaceId: string,
+  ): Promise<FlatSkill[]> {
+    if (names.length === 0) {
+      return [];
+    }
+
+    const { flatSkillMaps } =
+      await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+        {
+          workspaceId,
+          flatMapsKeys: ['flatSkillMaps'],
+        },
+      );
+
+    return Object.values(flatSkillMaps.byId)
+      .filter(isDefined)
+      .filter(
+        (flatSkill) => names.includes(flatSkill.name) && flatSkill.isActive,
+      );
+  }
+
+  async activate(id: string, workspaceId: string): Promise<SkillDTO> {
+    const { flatSkillMaps } =
+      await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+        {
+          workspaceId,
+          flatMapsKeys: ['flatSkillMaps'],
+        },
+      );
+
+    const existingFlatSkill = findFlatEntityByIdInFlatEntityMapsOrThrow({
+      flatEntityId: id,
+      flatEntityMaps: flatSkillMaps,
+    });
+
+    const flatSkillToUpdate: FlatSkill = {
+      ...existingFlatSkill,
+      isActive: true,
+      updatedAt: new Date().toISOString(),
+    };
+
+    const validateAndBuildResult =
+      await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
+        {
+          allFlatEntityOperationByMetadataName: {
+            skill: {
+              flatEntityToCreate: [],
+              flatEntityToDelete: [],
+              flatEntityToUpdate: [flatSkillToUpdate],
+            },
+          },
+          workspaceId,
+          isSystemBuild: false,
+        },
+      );
+
+    if (isDefined(validateAndBuildResult)) {
+      throw new WorkspaceMigrationBuilderExceptionV2(
+        validateAndBuildResult,
+        'Multiple validation errors occurred while activating skill',
+      );
+    }
+
+    const { flatSkillMaps: recomputedFlatSkillMaps } =
+      await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+        {
+          workspaceId,
+          flatMapsKeys: ['flatSkillMaps'],
+        },
+      );
+
+    return fromFlatSkillToSkillDto(
+      findFlatEntityByIdInFlatEntityMapsOrThrow({
+        flatEntityId: id,
+        flatEntityMaps: recomputedFlatSkillMaps,
+      }),
+    );
+  }
+
+  async deactivate(id: string, workspaceId: string): Promise<SkillDTO> {
+    const { flatSkillMaps } =
+      await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+        {
+          workspaceId,
+          flatMapsKeys: ['flatSkillMaps'],
+        },
+      );
+
+    const existingFlatSkill = findFlatEntityByIdInFlatEntityMapsOrThrow({
+      flatEntityId: id,
+      flatEntityMaps: flatSkillMaps,
+    });
+
+    const flatSkillToUpdate: FlatSkill = {
+      ...existingFlatSkill,
+      isActive: false,
+      updatedAt: new Date().toISOString(),
+    };
+
+    const validateAndBuildResult =
+      await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
+        {
+          allFlatEntityOperationByMetadataName: {
+            skill: {
+              flatEntityToCreate: [],
+              flatEntityToDelete: [],
+              flatEntityToUpdate: [flatSkillToUpdate],
+            },
+          },
+          workspaceId,
+          isSystemBuild: false,
+        },
+      );
+
+    if (isDefined(validateAndBuildResult)) {
+      throw new WorkspaceMigrationBuilderExceptionV2(
+        validateAndBuildResult,
+        'Multiple validation errors occurred while deactivating skill',
+      );
+    }
+
+    const { flatSkillMaps: recomputedFlatSkillMaps } =
+      await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+        {
+          workspaceId,
+          flatMapsKeys: ['flatSkillMaps'],
+        },
+      );
+
+    return fromFlatSkillToSkillDto(
+      findFlatEntityByIdInFlatEntityMapsOrThrow({
+        flatEntityId: id,
+        flatEntityMaps: recomputedFlatSkillMaps,
+      }),
+    );
+  }
+
+  async findByIdOrThrow(id: string, workspaceId: string): Promise<SkillDTO> {
+    const skill = await this.findById(id, workspaceId);
+
+    if (!isDefined(skill)) {
+      throw new SkillException(
+        'Skill not found',
+        SkillExceptionCode.SKILL_NOT_FOUND,
+      );
+    }
+
+    return skill;
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/skill/utils/skill-graphql-api-exception-handler.util.ts b/packages/twenty-server/src/engine/metadata-modules/skill/utils/skill-graphql-api-exception-handler.util.ts
new file mode 100644
index 00000000000..18923e138c8
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/skill/utils/skill-graphql-api-exception-handler.util.ts
@@ -0,0 +1,32 @@
+import { assertUnreachable } from 'twenty-shared/utils';
+
+import {
+  ConflictError,
+  ForbiddenError,
+  NotFoundError,
+  UserInputError,
+} from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
+import {
+  SkillException,
+  SkillExceptionCode,
+} from 'src/engine/metadata-modules/skill/skill.exception';
+
+export const skillGraphqlApiExceptionHandler = (error: Error) => {
+  if (error instanceof SkillException) {
+    switch (error.code) {
+      case SkillExceptionCode.SKILL_NOT_FOUND:
+        throw new NotFoundError(error);
+      case SkillExceptionCode.INVALID_SKILL_INPUT:
+        throw new UserInputError(error);
+      case SkillExceptionCode.SKILL_ALREADY_EXISTS:
+        throw new ConflictError(error);
+      case SkillExceptionCode.SKILL_IS_STANDARD:
+        throw new ForbiddenError(error);
+      default: {
+        return assertUnreachable(error.code);
+      }
+    }
+  }
+
+  throw error;
+};
diff --git a/packages/twenty-server/src/engine/workspace-cache/types/workspace-cache-key.type.ts b/packages/twenty-server/src/engine/workspace-cache/types/workspace-cache-key.type.ts
index f33731f5c7a..e49e1ee3243 100644
--- a/packages/twenty-server/src/engine/workspace-cache/types/workspace-cache-key.type.ts
+++ b/packages/twenty-server/src/engine/workspace-cache/types/workspace-cache-key.type.ts
@@ -31,6 +31,7 @@ export const WORKSPACE_CACHE_KEYS_V2 = {
   flatRoleTargetMaps: 'flat-maps:role-target',
   ORMEntityMetadatas: 'orm:entity-metadatas',
   flatAgentMaps: 'flat-maps:agent',
+  flatSkillMaps: 'flat-maps:skill',
   flatRoleTargetByAgentIdMaps: 'flat-maps:flatRoleTargetByAgentId',
   flatPageLayoutMaps: 'flat-maps:page-layout',
   flatPageLayoutWidgetMaps: 'flat-maps:page-layout-widget',
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-skill.constant.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-skill.constant.ts
new file mode 100644
index 00000000000..aa16b50c9f0
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-skill.constant.ts
@@ -0,0 +1,37 @@
+export const STANDARD_SKILL = {
+  'workflow-building': {
+    universalIdentifier: '20202020-6155-838a-b64e-44a791fbdc13',
+  },
+  'data-manipulation': {
+    universalIdentifier: '20202020-e225-f5c7-3d56-45feaa36f2e6',
+  },
+  'dashboard-building': {
+    universalIdentifier: '20202020-398f-0d7a-82db-4f43bc7e7044',
+  },
+  'metadata-building': {
+    universalIdentifier: '20202020-c66a-5fed-4a74-46e0b42a6332',
+  },
+  research: {
+    universalIdentifier: '20202020-db75-4fca-6813-4c7db0f964a0',
+  },
+  'code-interpreter': {
+    universalIdentifier: '20202020-5eb9-e775-cf4e-4f22be7be362',
+  },
+  xlsx: {
+    universalIdentifier: '20202020-2c7f-5b77-dfa4-494b84752ab7',
+  },
+  pdf: {
+    universalIdentifier: '20202020-c3d1-e0c9-2f93-45648b8bbd26',
+  },
+  docx: {
+    universalIdentifier: '20202020-6f15-2432-0537-4e23a2efd1cb',
+  },
+  pptx: {
+    universalIdentifier: '20202020-c81b-baf8-5255-4c34bd0eac9b',
+  },
+} as const satisfies Record<
+  string,
+  {
+    universalIdentifier: string;
+  }
+>;
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-all-metadata-name.constant.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-all-metadata-name.constant.ts
index 2fe2ebfea5d..8ea6d9bb305 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-all-metadata-name.constant.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-all-metadata-name.constant.ts
@@ -10,4 +10,5 @@ export const TWENTY_STANDARD_ALL_METADATA_NAME = [
   'view',
   'role',
   'agent',
+  'skill',
 ] as const satisfies AllMetadataName[];
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/types/all-standard-skill-name.type.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/types/all-standard-skill-name.type.ts
new file mode 100644
index 00000000000..7aab7c30cfb
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/types/all-standard-skill-name.type.ts
@@ -0,0 +1,3 @@
+import type { STANDARD_SKILL } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-skill.constant';
+
+export type AllStandardSkillName = keyof typeof STANDARD_SKILL;
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/skill-metadata/build-standard-flat-skill-metadata-maps.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/skill-metadata/build-standard-flat-skill-metadata-maps.util.ts
new file mode 100644
index 00000000000..457de23c9ea
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/skill-metadata/build-standard-flat-skill-metadata-maps.util.ts
@@ -0,0 +1,25 @@
+import { type FlatSkill } from 'src/engine/metadata-modules/flat-skill/types/flat-skill.type';
+import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
+import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
+import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';
+import { type CreateStandardSkillArgs } from 'src/engine/workspace-manager/twenty-standard-application/utils/skill-metadata/create-standard-skill-flat-metadata.util';
+import { STANDARD_FLAT_SKILL_METADATA_BUILDERS_BY_SKILL_NAME } from 'src/engine/workspace-manager/twenty-standard-application/utils/skill-metadata/create-standard-flat-skill-metadata.util';
+
+export const buildStandardFlatSkillMetadataMaps = (
+  args: Omit<CreateStandardSkillArgs, 'context'>,
+): FlatEntityMaps<FlatSkill> => {
+  const allSkillMetadatas: FlatSkill[] = Object.values(
+    STANDARD_FLAT_SKILL_METADATA_BUILDERS_BY_SKILL_NAME,
+  ).map((builder) => builder(args));
+
+  let flatSkillMetadataMaps = createEmptyFlatEntityMaps();
+
+  for (const skillMetadata of allSkillMetadatas) {
+    flatSkillMetadataMaps = addFlatEntityToFlatEntityMapsOrThrow({
+      flatEntity: skillMetadata,
+      flatEntityMaps: flatSkillMetadataMaps,
+    });
+  }
+
+  return flatSkillMetadataMaps;
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/skill-metadata/create-standard-flat-skill-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/skill-metadata/create-standard-flat-skill-metadata.util.ts
new file mode 100644
index 00000000000..d5ed649c7dc
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/skill-metadata/create-standard-flat-skill-metadata.util.ts
@@ -0,0 +1,1044 @@
+import { type FlatSkill } from 'src/engine/metadata-modules/flat-skill/types/flat-skill.type';
+import { type AllStandardSkillName } from 'src/engine/workspace-manager/twenty-standard-application/types/all-standard-skill-name.type';
+import {
+  type CreateStandardSkillArgs,
+  createStandardSkillFlatMetadata,
+} from 'src/engine/workspace-manager/twenty-standard-application/utils/skill-metadata/create-standard-skill-flat-metadata.util';
+
+export const STANDARD_FLAT_SKILL_METADATA_BUILDERS_BY_SKILL_NAME = {
+  'workflow-building': (args: Omit<CreateStandardSkillArgs, 'context'>) =>
+    createStandardSkillFlatMetadata({
+      ...args,
+      context: {
+        skillName: 'workflow-building',
+        name: 'workflow-building',
+        label: 'Workflow Building',
+        description:
+          'Creating and managing automation workflows with triggers and steps',
+        icon: 'IconSettingsAutomation',
+        content: `# Workflow Building Skill
+
+You help users create and manage automation workflows.
+
+## Capabilities
+
+- Create workflows from scratch
+- Modify existing workflows (add, remove, update steps)
+- Explain workflow structure and suggest improvements
+
+## Key Concepts
+
+- **Triggers**: DATABASE_EVENT, MANUAL, CRON, WEBHOOK
+- **Steps**: CREATE_RECORD, SEND_EMAIL, CODE, etc.
+- **Data flow**: Use {{stepId.fieldName}} to reference previous step outputs
+- **Relationships**: Use nested objects like {"company": {"id": "{{reference}}"}}
+
+## CRON Trigger Settings Schema
+
+For CRON triggers, settings.type must be one of these exact values:
+
+1. **DAYS** - Daily schedule
+   - Requires: schedule: { day: number (1+), hour: number (0-23), minute: number (0-59) }
+   - Example: { type: "DAYS", schedule: { day: 1, hour: 9, minute: 0 }, outputSchema: {} }
+
+2. **HOURS** - Hourly schedule (USE THIS FOR "EVERY HOUR")
+   - Requires: schedule: { hour: number (1+), minute: number (0-59) }
+   - Example: { type: "HOURS", schedule: { hour: 1, minute: 0 }, outputSchema: {} }
+   - This runs every X hours at Y minutes past the hour
+
+3. **MINUTES** - Minute-based schedule
+   - Requires: schedule: { minute: number (1+) }
+   - Example: { type: "MINUTES", schedule: { minute: 15 }, outputSchema: {} }
+
+4. **CUSTOM** - Custom cron pattern
+   - Requires: pattern: string (cron expression)
+   - Example: { type: "CUSTOM", pattern: "0 * * * *", outputSchema: {} }
+
+## Critical Notes
+
+Always rely on tool schema definitions:
+- The workflow creation tool provides comprehensive schemas with examples
+- Follow schema definitions exactly for field names, types, and structures
+- Schema includes validation rules and common patterns
+
+## Approach
+
+- Ask clarifying questions to understand user needs
+- Suggest appropriate actions for the use case
+- Explain each step and why it's needed
+- For modifications, understand current structure first
+- Ensure workflow logic remains coherent
+
+Prioritize user understanding and workflow effectiveness.`,
+        isCustom: false,
+      },
+    }),
+
+  'data-manipulation': (args: Omit<CreateStandardSkillArgs, 'context'>) =>
+    createStandardSkillFlatMetadata({
+      ...args,
+      context: {
+        skillName: 'data-manipulation',
+        name: 'data-manipulation',
+        label: 'Data Manipulation',
+        description:
+          'Searching, filtering, creating, and updating records across all objects',
+        icon: 'IconDatabase',
+        content: `# Data Manipulation Skill
+
+You explore and manage data across companies, people, opportunities, tasks, notes, and custom objects.
+
+## Capabilities
+
+- Search, filter, sort, create, update records
+- Manage relationships between records
+- Bulk operations and data analysis
+
+## Constraints
+
+- READ and WRITE access to all objects
+- CANNOT delete records or access workflow objects
+- CANNOT modify workspace settings
+
+## Multi-step Approach
+
+- Chain queries to solve complex requests (e.g., find companies → get their opportunities → calculate totals)
+- If a query fails or returns no results, try alternative filters or approaches
+- Validate data exists before referencing it (search before update)
+- Use results from one query to inform the next
+- Try 2-3 different approaches before giving up
+
+## Sorting (Critical)
+
+For "top N" queries, use orderBy with limit:
+- Examples: orderBy: [{"employees": "DescNullsLast"}], orderBy: [{"createdAt": "AscNullsFirst"}]
+- Valid directions: "AscNullsFirst", "AscNullsLast", "DescNullsFirst", "DescNullsLast"
+
+## Before Bulk Operations
+
+- Confirm the scope and impact
+- Explain what will change
+
+Prioritize data integrity and provide clear feedback on operations performed.`,
+        isCustom: false,
+      },
+    }),
+
+  'dashboard-building': (args: Omit<CreateStandardSkillArgs, 'context'>) =>
+    createStandardSkillFlatMetadata({
+      ...args,
+      context: {
+        skillName: 'dashboard-building',
+        name: 'dashboard-building',
+        label: 'Dashboard Building',
+        description:
+          'Creating and managing dashboards with widgets and layouts',
+        icon: 'IconLayoutDashboard',
+        content: `# Dashboard Building Skill
+
+You help users create and manage dashboards with widgets.
+
+## CRITICAL: Creating GRAPH Widgets
+
+Before creating any GRAPH widget, you MUST:
+1. Use list_object_metadata_items to get the objectMetadataId (e.g., for "opportunity", "company")
+2. From the response, get the field IDs you need (aggregateFieldMetadataId, primaryAxisGroupByFieldMetadataId)
+
+GRAPH widgets require real UUIDs from the workspace metadata, NOT made-up values.
+
+## Widget Configuration
+
+### GRAPH - AGGREGATE (KPI numbers)
+Shows a single aggregated value (count, sum, average).
+Required:
+- objectMetadataId: UUID of the object (e.g., opportunity)
+- configuration.graphType: "AGGREGATE"
+- configuration.aggregateFieldMetadataId: UUID of field to aggregate
+- configuration.aggregateOperation: "COUNT", "SUM", "AVG", "MIN", "MAX"
+
+### GRAPH - BAR/LINE Charts
+Shows data grouped by a dimension.
+Required:
+- objectMetadataId: UUID of the object
+- configuration.graphType: "VERTICAL_BAR", "HORIZONTAL_BAR", or "LINE"
+- configuration.aggregateFieldMetadataId: field to aggregate
+- configuration.aggregateOperation: aggregation type
+- configuration.primaryAxisGroupByFieldMetadataId: field to group by (x-axis)
+
+### GRAPH - PIE Charts
+Shows data distribution as slices.
+Required:
+- objectMetadataId: UUID of the object
+- configuration.graphType: "PIE"
+- configuration.aggregateFieldMetadataId: field to aggregate
+- configuration.aggregateOperation: aggregation type
+- configuration.groupByFieldMetadataId: field to slice by
+
+### IFRAME
+Embeds external content:
+- configuration.url: "https://..."
+
+### STANDALONE_RICH_TEXT
+Text content widget:
+- configuration.body: "Your text here"
+
+## Grid System
+
+- 12 columns (0-11)
+- KPI widgets: rowSpan 2-4, columnSpan 3-4
+- Charts: rowSpan 6-8, columnSpan 6-12
+- Common layouts:
+  - 4 KPIs in a row: each { columnSpan: 3 }
+  - 2 charts side by side: each { columnSpan: 6 }
+  - Full width chart: { column: 0, columnSpan: 12 }
+
+## Workflow
+
+1. Ask user what data they want to visualize
+2. Load list_object_metadata_items to discover available objects and fields
+3. Create dashboard with appropriate widgets using real field IDs
+4. Use get_dashboard to verify creation
+
+## Best Practices
+
+- Place KPIs at the top (row 0)
+- Group related charts together
+- Use consistent heights within rows
+- Start simple, add complexity as needed`,
+        isCustom: false,
+      },
+    }),
+
+  'metadata-building': (args: Omit<CreateStandardSkillArgs, 'context'>) =>
+    createStandardSkillFlatMetadata({
+      ...args,
+      context: {
+        skillName: 'metadata-building',
+        name: 'metadata-building',
+        label: 'Metadata Building',
+        description:
+          'Managing the data model: creating objects, fields, and relations',
+        icon: 'IconBuildingSkyscraper',
+        content: `# Metadata Building Skill
+
+You help users manage their workspace data model by creating, updating, and organizing custom objects and fields.
+
+## Capabilities
+
+- Create new custom objects with appropriate naming and configuration
+- Add fields to existing objects (text, number, date, select, relation, etc.)
+- Update object and field properties (labels, descriptions, icons)
+- Manage field settings (required, unique, default values)
+- Create relations between objects
+
+## Key Concepts
+
+- **Objects**: Represent entities in the data model (e.g., Company, Person, Opportunity)
+- **Fields**: Properties of objects with specific types (TEXT, NUMBER, DATE_TIME, SELECT, RELATION, etc.)
+- **Relations**: Links between objects (one-to-many, many-to-one)
+- **Labels vs Names**: Labels are for display, names are internal identifiers (camelCase)
+
+## Field Types Available
+
+- **TEXT**: Simple text fields
+- **NUMBER**: Numeric values (integers or decimals)
+- **BOOLEAN**: True/false values
+- **DATE_TIME**: Date and time values
+- **DATE**: Date only values
+- **SELECT**: Single choice from options
+- **MULTI_SELECT**: Multiple choices from options
+- **LINK**: URL fields
+- **LINKS**: Multiple URL fields
+- **EMAIL**: Email address fields
+- **EMAILS**: Multiple email fields
+- **PHONE**: Phone number fields
+- **PHONES**: Multiple phone fields
+- **CURRENCY**: Monetary values
+- **RATING**: Star ratings
+- **RELATION**: Links to other objects
+- **RICH_TEXT**: Formatted text content
+
+## Best Practices
+
+- Use clear, descriptive names for objects and fields
+- Follow naming conventions: singular for object names, camelCase for field names
+- Add helpful descriptions to objects and fields
+- Choose appropriate field types for the data being stored
+- Consider relationships between objects when designing the data model
+
+## Approach
+
+- Ask clarifying questions to understand the user's data modeling needs
+- Suggest best practices for naming and organization
+- Explain the impact of changes to the data model
+- Verify object and field existence before making updates
+- Provide clear feedback on operations performed
+
+Prioritize data model integrity and user understanding.`,
+        isCustom: false,
+      },
+    }),
+
+  research: (args: Omit<CreateStandardSkillArgs, 'context'>) =>
+    createStandardSkillFlatMetadata({
+      ...args,
+      context: {
+        skillName: 'research',
+        name: 'research',
+        label: 'Research',
+        description: 'Finding information and gathering facts from the web',
+        icon: 'IconSearch',
+        content: `# Research Skill
+
+You find information and gather facts from the web.
+
+## Capabilities
+
+- Search for current information and facts
+- Research companies, people, technologies, trends
+- Gather competitive intelligence and market data
+- Find contact details and verify information
+
+## Research Strategy
+
+- Try multiple search queries from different angles
+- If initial searches fail, use alternative search terms
+- Cross-reference information when possible
+- Cite sources and provide context
+
+## Present Findings
+
+- Be thorough but concise
+- Organize information logically
+- Distinguish facts from speculation
+- Note if information might be outdated
+- Include relevant sources
+
+Be persistent in finding accurate information.`,
+        isCustom: false,
+      },
+    }),
+
+  'code-interpreter': (args: Omit<CreateStandardSkillArgs, 'context'>) =>
+    createStandardSkillFlatMetadata({
+      ...args,
+      context: {
+        skillName: 'code-interpreter',
+        name: 'code-interpreter',
+        label: 'Code Interpreter',
+        description:
+          'Python code execution for data analysis, complex multi-step operations, and efficient bulk processing via MCP bridge',
+        icon: 'IconCode',
+        content: `# Code Interpreter Skill
+
+You have access to the \`code_interpreter\` tool to execute Python code in a sandboxed environment.
+
+## How to Use
+Call the \`code_interpreter\` tool with your Python code. The tool will execute the code and return stdout, stderr, and any generated files.
+
+## Capabilities
+- Analyze CSV, Excel, and JSON data files
+- Create charts and visualizations (matplotlib, seaborn)
+- Generate reports (PDF, PPTX, Excel)
+- Perform calculations and data transformations
+
+## Pre-installed Libraries
+pandas, numpy, matplotlib, seaborn, scikit-learn, openpyxl, python-pptx
+
+## Input Files
+- User-uploaded files are available at \`/home/user/{filename}\`
+- Always check the file exists before processing
+
+## Output Files
+- Charts: Save to \`/home/user/output/\` directory - these are automatically returned as downloadable URLs
+- For matplotlib: \`plt.savefig('/home/user/output/chart.png')\`
+- Generated files: Save to \`/home/user/output/{filename}\`
+
+## Example: Create a Bar Chart
+\`\`\`python
+import matplotlib.pyplot as plt
+import os
+
+# Data
+months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun']
+sales = [100, 150, 200, 175, 250, 300]
+
+# Create chart
+plt.figure(figsize=(10, 6))
+plt.bar(months, sales, color='skyblue')
+plt.title('Monthly Sales')
+plt.xlabel('Month')
+plt.ylabel('Sales')
+plt.tight_layout()
+
+# Save to output directory
+os.makedirs('/home/user/output', exist_ok=True)
+plt.savefig('/home/user/output/sales_chart.png')
+print('Chart saved!')
+\`\`\`
+
+## Example: Analyze CSV
+\`\`\`python
+import pandas as pd
+import matplotlib.pyplot as plt
+import os
+
+# Load data
+df = pd.read_csv('/home/user/data.csv')
+print(f"Loaded {len(df)} rows")
+
+# Create visualization
+plt.figure(figsize=(10, 6))
+df.groupby('category')['value'].mean().plot(kind='bar')
+plt.title('Average Value by Category')
+plt.tight_layout()
+
+os.makedirs('/home/user/output', exist_ok=True)
+plt.savefig('/home/user/output/analysis.png')
+print('Analysis complete!')
+\`\`\`
+
+## Calling Twenty Tools from Python (MCP Bridge)
+
+A \`twenty\` helper is automatically available in your code. Use it to call any Twenty tool directly from Python:
+
+\`\`\`python
+# Find records
+people = twenty.call_tool('find_person_records', {'limit': 10})
+print(f"Found {len(people['edges'])} people")
+
+# Create a record
+result = twenty.call_tool('create_company_record', {
+    'data': {'name': 'Acme Corp', 'domainName': {'primaryLinkUrl': 'acme.com'}}
+})
+print(f"Created company: {result['id']}")
+
+# Update a record
+twenty.call_tool('update_person_record', {
+    'id': 'person-uuid',
+    'data': {'jobTitle': 'CEO'}
+})
+
+# List available tools
+tools = twenty.list_tools()
+for tool in tools:
+    print(f"- {tool['name']}: {tool['description']}")
+\`\`\`
+
+This allows you to orchestrate complex multi-step operations in a single code execution, which is more efficient than multiple tool calls.`,
+        isCustom: false,
+      },
+    }),
+
+  xlsx: (args: Omit<CreateStandardSkillArgs, 'context'>) =>
+    createStandardSkillFlatMetadata({
+      ...args,
+      context: {
+        skillName: 'xlsx',
+        name: 'xlsx',
+        label: 'Excel & Spreadsheets',
+        description:
+          'Excel/spreadsheet creation, editing, and analysis with formulas, formatting, and visualization',
+        icon: 'IconFileSpreadsheet',
+        content: `# Excel Processing Skill
+
+**IMPORTANT**: Save all output files to \`/home/user/output/\` for them to be downloadable.
+
+## Pre-installed Scripts
+
+- \`python /home/user/scripts/xlsx/recalc.py <excel_file> [timeout]\` - Recalculate formulas using LibreOffice
+
+## Requirements
+
+### Zero Formula Errors
+Every Excel model MUST be delivered with ZERO formula errors (#REF!, #DIV/0!, #VALUE!, #N/A, #NAME?)
+
+### Use Formulas, Not Hardcoded Values
+**Always use Excel formulas instead of calculating values in Python and hardcoding them.**
+
+\`\`\`python
+# ❌ WRONG - Hardcoding
+total = df['Sales'].sum()
+sheet['B10'] = total
+
+# ✅ CORRECT - Using formulas
+sheet['B10'] = '=SUM(B2:B9)'
+\`\`\`
+
+## Reading and Analyzing Data
+
+\`\`\`python
+import pandas as pd
+
+# Read Excel
+df = pd.read_excel('file.xlsx')
+all_sheets = pd.read_excel('file.xlsx', sheet_name=None)  # All sheets as dict
+
+# Analyze
+df.head()
+df.info()
+df.describe()
+\`\`\`
+
+## Creating New Excel Files
+
+\`\`\`python
+from openpyxl import Workbook
+from openpyxl.styles import Font, PatternFill, Alignment
+
+wb = Workbook()
+sheet = wb.active
+
+# Add data
+sheet['A1'] = 'Hello'
+sheet.append(['Row', 'of', 'data'])
+
+# Add formula
+sheet['B2'] = '=SUM(A1:A10)'
+
+# Formatting
+sheet['A1'].font = Font(bold=True)
+sheet['A1'].fill = PatternFill('solid', start_color='FFFF00')
+sheet['A1'].alignment = Alignment(horizontal='center')
+
+# Column width
+sheet.column_dimensions['A'].width = 20
+
+wb.save('/home/user/output/output.xlsx')
+\`\`\`
+
+## Editing Existing Files
+
+\`\`\`python
+from openpyxl import load_workbook
+
+wb = load_workbook('existing.xlsx')
+sheet = wb.active
+
+# Modify cells
+sheet['A1'] = 'New Value'
+sheet.insert_rows(2)
+
+wb.save('/home/user/output/modified.xlsx')
+\`\`\`
+
+## Recalculating Formulas (MANDATORY)
+
+After creating/editing files with formulas, run:
+\`\`\`bash
+python /home/user/scripts/xlsx/recalc.py /home/user/output/output.xlsx
+\`\`\`
+
+The script returns JSON with error details:
+\`\`\`json
+{
+  "status": "success",
+  "total_errors": 0,
+  "total_formulas": 42,
+  "error_summary": {}
+}
+\`\`\`
+
+If errors found, fix them and recalculate again.
+
+## Financial Model Color Coding
+
+- **Blue text**: Hardcoded inputs
+- **Black text**: Formulas and calculations
+- **Green text**: Links from other worksheets
+- **Yellow background**: Key assumptions needing attention
+
+## Number Formatting
+
+- Years: Format as text ("2024" not "2,024")
+- Currency: Use $#,##0 format
+- Percentages: 0.0% format
+- Negatives: Use parentheses (123) not minus -123
+
+## Quick Reference
+
+| Task | Tool | Example |
+|------|------|---------|
+| Read Excel | pandas | \`pd.read_excel('file.xlsx')\` |
+| Create Excel | openpyxl | \`Workbook()\` |
+| Add formula | openpyxl | \`sheet['B2'] = '=SUM(A1:A10)'\` |
+| Recalculate | script | \`python /home/user/scripts/xlsx/recalc.py file.xlsx\` |`,
+        isCustom: false,
+      },
+    }),
+
+  pdf: (args: Omit<CreateStandardSkillArgs, 'context'>) =>
+    createStandardSkillFlatMetadata({
+      ...args,
+      context: {
+        skillName: 'pdf',
+        name: 'pdf',
+        label: 'PDF Processing',
+        description:
+          'PDF form filling, field extraction, table parsing, and validation',
+        icon: 'IconFileTypePdf',
+        content: `# PDF Processing Skill
+
+**IMPORTANT**: Save all output files to \`/home/user/output/\` for them to be downloadable.
+
+## Pre-installed Scripts
+
+### Field Extraction
+- \`python /home/user/scripts/pdf/extract_form_field_info.py <pdf_file>\` - Extract all fillable field names and types (JSON output)
+- \`python /home/user/scripts/pdf/check_fillable_fields.py <pdf_file>\` - Check if PDF has fillable fields
+
+### Form Filling
+- \`python /home/user/scripts/pdf/fill_fillable_fields.py <pdf_file> <json_data> <output_file>\` - Fill PDF form fields
+- \`python /home/user/scripts/pdf/fill_pdf_form_with_annotations.py <pdf_file> <json_data> <output_file>\` - Fill with annotation support
+
+### Validation
+- \`python /home/user/scripts/pdf/create_validation_image.py <pdf_file>\` - Create validation image of filled PDF
+- \`python /home/user/scripts/pdf/check_bounding_boxes.py <pdf_file>\` - Check field boundaries
+- \`python /home/user/scripts/pdf/convert_pdf_to_images.py <pdf_file>\` - Convert PDF pages to images
+
+## Reading PDFs
+
+\`\`\`python
+import fitz  # PyMuPDF
+
+# Open PDF
+doc = fitz.open('document.pdf')
+
+# Extract text from all pages
+for page in doc:
+    text = page.get_text()
+    print(text)
+
+# Extract text from specific page
+page = doc[0]  # First page
+text = page.get_text()
+\`\`\`
+
+## Extracting Tables
+
+\`\`\`python
+import pdfplumber
+
+with pdfplumber.open('document.pdf') as pdf:
+    for page in pdf.pages:
+        tables = page.extract_tables()
+        for table in tables:
+            for row in table:
+                print(row)
+\`\`\`
+
+## Filling PDF Forms
+
+### Step 1: Extract field information
+\`\`\`bash
+python /home/user/scripts/pdf/extract_form_field_info.py form.pdf > fields.json
+\`\`\`
+
+### Step 2: Create fill data JSON
+\`\`\`json
+{
+  "field_name_1": "value1",
+  "field_name_2": "value2",
+  "checkbox_field": true
+}
+\`\`\`
+
+### Step 3: Fill the form
+\`\`\`bash
+python /home/user/scripts/pdf/fill_fillable_fields.py form.pdf fill_data.json /home/user/output/output.pdf
+\`\`\`
+
+### Step 4: Validate the output
+\`\`\`bash
+python /home/user/scripts/pdf/create_validation_image.py /home/user/output/output.pdf
+\`\`\`
+
+## Creating PDFs
+
+\`\`\`python
+from reportlab.lib.pagesizes import letter
+from reportlab.pdfgen import canvas
+
+c = canvas.Canvas('/home/user/output/output.pdf', pagesize=letter)
+c.drawString(100, 750, 'Hello World!')
+c.save()
+\`\`\`
+
+## Merging PDFs
+
+\`\`\`python
+from PyPDF2 import PdfMerger
+
+merger = PdfMerger()
+merger.append('file1.pdf')
+merger.append('file2.pdf')
+merger.write('/home/user/output/merged.pdf')
+merger.close()
+\`\`\`
+
+## Splitting PDFs
+
+\`\`\`python
+from PyPDF2 import PdfReader, PdfWriter
+
+reader = PdfReader('document.pdf')
+
+# Extract specific pages
+writer = PdfWriter()
+writer.add_page(reader.pages[0])  # First page
+writer.write('/home/user/output/page1.pdf')
+\`\`\`
+
+## Quick Reference
+
+| Task | Tool | Command/Example |
+|------|------|-----------------|
+| Extract text | PyMuPDF | \`page.get_text()\` |
+| Extract tables | pdfplumber | \`page.extract_tables()\` |
+| List form fields | script | \`python extract_form_field_info.py form.pdf\` |
+| Fill form | script | \`python fill_fillable_fields.py form.pdf data.json out.pdf\` |
+| Validate fill | script | \`python create_validation_image.py filled.pdf\` |
+| Create PDF | reportlab | \`canvas.Canvas('out.pdf')\` |
+| Merge PDFs | PyPDF2 | \`PdfMerger()\` |`,
+        isCustom: false,
+      },
+    }),
+
+  docx: (args: Omit<CreateStandardSkillArgs, 'context'>) =>
+    createStandardSkillFlatMetadata({
+      ...args,
+      context: {
+        skillName: 'docx',
+        name: 'docx',
+        label: 'Word Documents',
+        description:
+          'Word document creation, editing, template processing, and OOXML manipulation',
+        icon: 'IconFileTypeDocx',
+        content: `# Word Document Processing Skill
+
+**IMPORTANT**: Save all output files to \`/home/user/output/\` for them to be downloadable.
+
+## Pre-installed Scripts (OOXML Editing)
+
+- \`python /home/user/scripts/docx/unpack.py <docx_file> <output_dir>\` - Unpack .docx to XML files for direct editing
+- \`python /home/user/scripts/docx/pack.py <input_dir> <docx_file>\` - Repack XML files into .docx
+- \`python /home/user/scripts/docx/validate.py <docx_file>\` - Validate document structure
+
+### Validation Scripts
+- \`/home/user/scripts/docx/validation/docx.py\` - DOCX validation module
+- \`/home/user/scripts/docx/validation/redlining.py\` - Track changes/redline validation
+
+## High-Level API (python-docx)
+
+### Reading Documents
+
+\`\`\`python
+from docx import Document
+
+doc = Document('document.docx')
+
+# Read paragraphs
+for para in doc.paragraphs:
+    print(para.text)
+
+# Read tables
+for table in doc.tables:
+    for row in table.rows:
+        for cell in row.cells:
+            print(cell.text)
+\`\`\`
+
+### Creating Documents
+
+\`\`\`python
+from docx import Document
+from docx.shared import Inches, Pt
+from docx.enum.text import WD_ALIGN_PARAGRAPH
+
+doc = Document()
+
+# Add heading
+doc.add_heading('Document Title', 0)
+
+# Add paragraph with formatting
+para = doc.add_paragraph('Normal text. ')
+run = para.add_run('Bold text.')
+run.bold = True
+
+# Add table
+table = doc.add_table(rows=2, cols=2)
+table.cell(0, 0).text = 'Header 1'
+table.cell(0, 1).text = 'Header 2'
+
+# Add image
+doc.add_picture('image.png', width=Inches(4))
+
+doc.save('/home/user/output/output.docx')
+\`\`\`
+
+## Low-Level OOXML Editing
+
+For complex edits (tracked changes, custom XML), use the unpack/edit/pack workflow:
+
+### Step 1: Unpack
+\`\`\`bash
+python /home/user/scripts/docx/unpack.py document.docx ./unpacked/
+\`\`\`
+
+### Step 2: Edit XML directly
+\`\`\`python
+import xml.etree.ElementTree as ET
+
+tree = ET.parse('./unpacked/word/document.xml')
+root = tree.getroot()
+
+# Edit XML...
+# Namespaces: w = http://schemas.openxmlformats.org/wordprocessingml/2006/main
+
+tree.write('./unpacked/word/document.xml', xml_declaration=True, encoding='UTF-8')
+\`\`\`
+
+### Step 3: Validate & Repack
+\`\`\`bash
+python /home/user/scripts/docx/validate.py ./unpacked/
+python /home/user/scripts/docx/pack.py ./unpacked/ /home/user/output/output.docx
+\`\`\`
+
+## Template Processing
+
+### Find and Replace
+\`\`\`python
+from docx import Document
+
+doc = Document('template.docx')
+
+for para in doc.paragraphs:
+    if '{{name}}' in para.text:
+        para.text = para.text.replace('{{name}}', 'John Doe')
+
+doc.save('/home/user/output/filled.docx')
+\`\`\`
+
+### Preserve Formatting During Replace
+\`\`\`python
+def replace_in_paragraph(para, old_text, new_text):
+    """Replace text while preserving formatting"""
+    for run in para.runs:
+        if old_text in run.text:
+            run.text = run.text.replace(old_text, new_text)
+
+for para in doc.paragraphs:
+    replace_in_paragraph(para, '{{name}}', 'John Doe')
+\`\`\`
+
+## Working with Styles
+
+\`\`\`python
+from docx.shared import Pt, RGBColor
+
+# Set font
+run.font.name = 'Arial'
+run.font.size = Pt(12)
+run.font.color.rgb = RGBColor(0, 0, 0)
+
+# Paragraph formatting
+para.alignment = WD_ALIGN_PARAGRAPH.CENTER
+para.paragraph_format.space_before = Pt(12)
+para.paragraph_format.space_after = Pt(12)
+\`\`\`
+
+## Quick Reference
+
+| Task | Tool | Example |
+|------|------|---------|
+| Read document | python-docx | \`Document('file.docx')\` |
+| Create document | python-docx | \`Document()\` |
+| Add heading | python-docx | \`doc.add_heading('Title', 0)\` |
+| Add table | python-docx | \`doc.add_table(rows=2, cols=2)\` |
+| Unpack for editing | script | \`python unpack.py doc.docx ./out/\` |
+| Repack | script | \`python pack.py ./out/ doc.docx\` |
+| Validate | script | \`python validate.py doc.docx\` |`,
+        isCustom: false,
+      },
+    }),
+
+  pptx: (args: Omit<CreateStandardSkillArgs, 'context'>) =>
+    createStandardSkillFlatMetadata({
+      ...args,
+      context: {
+        skillName: 'pptx',
+        name: 'pptx',
+        label: 'PowerPoint',
+        description:
+          'PowerPoint creation, editing, templates, thumbnails, and slide manipulation',
+        icon: 'IconPresentation',
+        content: `# PowerPoint Processing Skill
+
+**IMPORTANT**: Save all output files to \`/home/user/output/\` for them to be downloadable.
+
+## Pre-installed Scripts
+
+- \`python /home/user/scripts/pptx/thumbnail.py <pptx_file> [output_dir]\` - Generate slide thumbnails
+- \`python /home/user/scripts/pptx/rearrange.py <pptx_file> <slide_order_json> <output_file>\` - Reorder slides
+- \`python /home/user/scripts/pptx/inventory.py <pptx_file>\` - List all slides and their content
+- \`python /home/user/scripts/pptx/replace.py <pptx_file> <replacements_json> <output_file>\` - Find/replace text
+
+## Reading Presentations
+
+\`\`\`python
+from pptx import Presentation
+
+prs = Presentation('presentation.pptx')
+
+# Iterate through slides
+for slide in prs.slides:
+    for shape in slide.shapes:
+        if shape.has_text_frame:
+            print(shape.text)
+\`\`\`
+
+## Creating Presentations
+
+\`\`\`python
+from pptx import Presentation
+from pptx.util import Inches, Pt
+
+prs = Presentation()
+
+# Add title slide
+slide_layout = prs.slide_layouts[0]  # Title layout
+slide = prs.slides.add_slide(slide_layout)
+title = slide.shapes.title
+subtitle = slide.placeholders[1]
+
+title.text = "Presentation Title"
+subtitle.text = "Subtitle goes here"
+
+# Add content slide
+slide_layout = prs.slide_layouts[1]  # Title and content
+slide = prs.slides.add_slide(slide_layout)
+title = slide.shapes.title
+body = slide.placeholders[1]
+
+title.text = "Slide Title"
+tf = body.text_frame
+tf.text = "First bullet"
+p = tf.add_paragraph()
+p.text = "Second bullet"
+p.level = 1
+
+prs.save('/home/user/output/output.pptx')
+\`\`\`
+
+## Adding Images
+
+\`\`\`python
+from pptx.util import Inches
+
+slide = prs.slides.add_slide(prs.slide_layouts[6])  # Blank layout
+slide.shapes.add_picture(
+    'image.png',
+    left=Inches(1),
+    top=Inches(1),
+    width=Inches(5)
+)
+\`\`\`
+
+## Adding Tables
+
+\`\`\`python
+from pptx.util import Inches
+
+slide = prs.slides.add_slide(prs.slide_layouts[6])
+table = slide.shapes.add_table(
+    rows=3, cols=3,
+    left=Inches(1), top=Inches(1),
+    width=Inches(8), height=Inches(2)
+).table
+
+# Set cell values
+table.cell(0, 0).text = "Header 1"
+table.cell(0, 1).text = "Header 2"
+table.cell(1, 0).text = "Data 1"
+\`\`\`
+
+## Adding Charts
+
+\`\`\`python
+from pptx.chart.data import CategoryChartData
+from pptx.enum.chart import XL_CHART_TYPE
+from pptx.util import Inches
+
+chart_data = CategoryChartData()
+chart_data.categories = ['East', 'West', 'Midwest']
+chart_data.add_series('Series 1', (19.2, 21.4, 16.7))
+
+slide = prs.slides.add_slide(prs.slide_layouts[6])
+chart = slide.shapes.add_chart(
+    XL_CHART_TYPE.COLUMN_CLUSTERED,
+    Inches(1), Inches(1), Inches(8), Inches(5),
+    chart_data
+).chart
+\`\`\`
+
+## Using Scripts
+
+### Generate Thumbnails
+\`\`\`bash
+python /home/user/scripts/pptx/thumbnail.py presentation.pptx ./thumbnails/
+# Creates: thumbnails/slide_1.png, slide_2.png, etc.
+\`\`\`
+
+### Get Slide Inventory
+\`\`\`bash
+python /home/user/scripts/pptx/inventory.py presentation.pptx
+# Returns JSON with all slide content and shapes
+\`\`\`
+
+### Reorder Slides
+\`\`\`bash
+# Order: [3, 1, 2] means slide 3 becomes first, slide 1 second, etc.
+python /home/user/scripts/pptx/rearrange.py input.pptx '[3, 1, 2]' output.pptx
+\`\`\`
+
+### Find and Replace Text
+\`\`\`bash
+python /home/user/scripts/pptx/replace.py input.pptx '{"{{company}}": "Acme Corp", "{{date}}": "2024"}' output.pptx
+\`\`\`
+
+## Template Processing Workflow
+
+1. **Generate thumbnails** to understand slide structure:
+   \`\`\`bash
+   python /home/user/scripts/pptx/thumbnail.py template.pptx ./preview/
+   \`\`\`
+
+2. **Get inventory** to find placeholder text:
+   \`\`\`bash
+   python /home/user/scripts/pptx/inventory.py template.pptx
+   \`\`\`
+
+3. **Replace placeholders**:
+   \`\`\`bash
+   python /home/user/scripts/pptx/replace.py template.pptx '{"{{title}}": "Q4 Report"}' output.pptx
+   \`\`\`
+
+## Quick Reference
+
+| Task | Tool | Example |
+|------|------|---------|
+| Read presentation | python-pptx | \`Presentation('file.pptx')\` |
+| Create presentation | python-pptx | \`Presentation()\` |
+| Add slide | python-pptx | \`prs.slides.add_slide(layout)\` |
+| Generate thumbnails | script | \`python thumbnail.py pres.pptx ./out/\` |
+| Get slide inventory | script | \`python inventory.py pres.pptx\` |
+| Reorder slides | script | \`python rearrange.py pres.pptx '[2,1,3]' out.pptx\` |
+| Find/replace | script | \`python replace.py pres.pptx '{...}' out.pptx\` |`,
+        isCustom: false,
+      },
+    }),
+} satisfies {
+  [P in AllStandardSkillName]: (
+    args: Omit<CreateStandardSkillArgs, 'context'>,
+  ) => FlatSkill;
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/skill-metadata/create-standard-skill-flat-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/skill-metadata/create-standard-skill-flat-metadata.util.ts
new file mode 100644
index 00000000000..b2f138a6203
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/skill-metadata/create-standard-skill-flat-metadata.util.ts
@@ -0,0 +1,46 @@
+import { v4 } from 'uuid';
+
+import { type FlatSkill } from 'src/engine/metadata-modules/flat-skill/types/flat-skill.type';
+import { STANDARD_SKILL } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-skill.constant';
+import { type AllStandardSkillName } from 'src/engine/workspace-manager/twenty-standard-application/types/all-standard-skill-name.type';
+import { type StandardBuilderArgs } from 'src/engine/workspace-manager/twenty-standard-application/types/metadata-standard-buillder-args.type';
+
+export type CreateStandardSkillContext = {
+  skillName: AllStandardSkillName;
+  name: string;
+  label: string;
+  icon: string | null;
+  description: string | null;
+  content: string;
+  isCustom: boolean;
+};
+
+export type CreateStandardSkillArgs = StandardBuilderArgs<'skill'> & {
+  context: CreateStandardSkillContext;
+};
+
+export const createStandardSkillFlatMetadata = ({
+  context: { skillName, name, label, icon, description, content, isCustom },
+  workspaceId,
+  twentyStandardApplicationId,
+  now,
+}: CreateStandardSkillArgs): FlatSkill => {
+  const universalIdentifier = STANDARD_SKILL[skillName].universalIdentifier;
+
+  return {
+    id: v4(),
+    universalIdentifier,
+    standardId: universalIdentifier,
+    name,
+    label,
+    icon,
+    description,
+    content,
+    isCustom,
+    isActive: true,
+    workspaceId,
+    applicationId: twentyStandardApplicationId,
+    createdAt: now,
+    updatedAt: now,
+  };
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/twenty-standard-application-all-flat-entity-maps.constant.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/twenty-standard-application-all-flat-entity-maps.constant.ts
index 0a9f3feb0d5..2fc36f2bb02 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/twenty-standard-application-all-flat-entity-maps.constant.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/twenty-standard-application-all-flat-entity-maps.constant.ts
@@ -1,6 +1,7 @@
 import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
 import { type TwentyStandardAllFlatEntityMaps } from 'src/engine/workspace-manager/twenty-standard-application/types/twenty-standard-all-flat-entity-maps.type';
 import { buildStandardFlatAgentMetadataMaps } from 'src/engine/workspace-manager/twenty-standard-application/utils/agent-metadata/build-standard-flat-agent-metadata-maps.util';
+import { buildStandardFlatSkillMetadataMaps } from 'src/engine/workspace-manager/twenty-standard-application/utils/skill-metadata/build-standard-flat-skill-metadata-maps.util';
 import { buildStandardFlatFieldMetadataMaps } from 'src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/build-standard-flat-field-metadata-maps.util';
 import { getStandardObjectMetadataRelatedEntityIds } from 'src/engine/workspace-manager/twenty-standard-application/utils/get-standard-object-metadata-related-entity-ids.util';
 import { buildStandardFlatIndexMetadataMaps } from 'src/engine/workspace-manager/twenty-standard-application/utils/index/build-standard-flat-index-metadata-maps.util';
@@ -122,6 +123,14 @@ export const computeTwentyStandardApplicationAllFlatEntityMaps = ({
     },
   });
 
+  const flatSkillMaps = buildStandardFlatSkillMetadataMaps({
+    now,
+    workspaceId,
+    twentyStandardApplicationId,
+    standardObjectMetadataRelatedEntityIds,
+    dependencyFlatEntityMaps: undefined,
+  });
+
   return {
     flatViewFieldMaps,
     flatViewFilterMaps,
@@ -132,5 +141,6 @@ export const computeTwentyStandardApplicationAllFlatEntityMaps = ({
     flatObjectMetadataMaps,
     flatRoleMaps,
     flatAgentMaps,
+    flatSkillMaps,
   };
 };
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/interceptors/utils/from-workspace-migration-builder-exception-to-metadata-validation-response-error.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/interceptors/utils/from-workspace-migration-builder-exception-to-metadata-validation-response-error.util.ts
index b2f887ee5a8..7cb56361f2f 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/interceptors/utils/from-workspace-migration-builder-exception-to-metadata-validation-response-error.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/interceptors/utils/from-workspace-migration-builder-exception-to-metadata-validation-response-error.util.ts
@@ -18,6 +18,7 @@ export const fromWorkspaceMigrationBuilderExceptionToMetadataValidationResponseE
     return {
       summary: {
         invalidAgent: 0,
+        invalidSkill: 0,
         invalidViewFilter: 0,
         invalidViewFilterGroup: 0,
         invalidObjectMetadata: 0,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/services/workspace-migration-build-orchestrator.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/services/workspace-migration-build-orchestrator.service.ts
index 13f1d0d8749..9bbd3b432c5 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/services/workspace-migration-build-orchestrator.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/services/workspace-migration-build-orchestrator.service.ts
@@ -29,6 +29,7 @@ import { WorkspaceMigrationV2RouteTriggerActionsBuilderService } from 'src/engin
 import { WorkspaceMigrationV2RowLevelPermissionPredicateGroupActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/row-level-permission-predicate-group/workspace-migration-v2-row-level-permission-predicate-group-actions-builder.service';
 import { WorkspaceMigrationV2RowLevelPermissionPredicateActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/row-level-permission-predicate/workspace-migration-v2-row-level-permission-predicate-actions-builder.service';
 import { WorkspaceMigrationV2ServerlessFunctionActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/serverless-function/workspace-migration-v2-serverless-function-actions-builder.service';
+import { WorkspaceMigrationV2SkillActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/skill/workspace-migration-v2-skill-actions-builder.service';
 import { WorkspaceMigrationV2ViewFieldActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/view-field/workspace-migration-v2-view-field-actions-builder.service';
 import { WorkspaceMigrationV2ViewFilterGroupActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/view-filter-group/workspace-migration-v2-view-filter-group-actions-builder.service';
 import { WorkspaceMigrationV2ViewFilterActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/view-filter/workspace-migration-v2-view-filter-actions-builder.service';
@@ -53,6 +54,7 @@ export class WorkspaceMigrationBuildOrchestratorService {
     private readonly workspaceMigrationV2FieldActionsBuilderService: WorkspaceMigrationV2FieldActionsBuilderService,
     private readonly workspaceMigrationV2RoleActionsBuilderService: WorkspaceMigrationV2RoleActionsBuilderService,
     private readonly workspaceMigrationV2AgentActionsBuilderService: WorkspaceMigrationV2AgentActionsBuilderService,
+    private readonly workspaceMigrationV2SkillActionsBuilderService: WorkspaceMigrationV2SkillActionsBuilderService,
     private readonly workspaceMigrationV2PageLayoutActionsBuilderService: WorkspaceMigrationV2PageLayoutActionsBuilderService,
     private readonly workspaceMigrationV2PageLayoutWidgetActionsBuilderService: WorkspaceMigrationV2PageLayoutWidgetActionsBuilderService,
     private readonly workspaceMigrationV2PageLayoutTabActionsBuilderService: WorkspaceMigrationV2PageLayoutTabActionsBuilderService,
@@ -153,6 +155,7 @@ export class WorkspaceMigrationBuildOrchestratorService {
       flatRoleMaps,
       flatRoleTargetMaps,
       flatAgentMaps,
+      flatSkillMaps,
       flatPageLayoutMaps,
       flatPageLayoutWidgetMaps,
       flatPageLayoutTabMaps,
@@ -781,6 +784,36 @@ export class WorkspaceMigrationBuildOrchestratorService {
       }
     }
 
+    if (isDefined(flatSkillMaps)) {
+      const { from: fromFlatSkillMaps, to: toFlatSkillMaps } = flatSkillMaps;
+
+      const skillResult =
+        await this.workspaceMigrationV2SkillActionsBuilderService.validateAndBuild(
+          {
+            additionalCacheDataMaps,
+            from: fromFlatSkillMaps,
+            to: toFlatSkillMaps,
+            buildOptions,
+            dependencyOptimisticFlatEntityMaps: undefined,
+            workspaceId,
+          },
+        );
+
+      this.mergeFlatEntityMapsAndRelatedFlatEntityMapsInAllFlatEntityMapsThroughMutation(
+        {
+          allFlatEntityMaps: optimisticAllFlatEntityMaps,
+          flatEntityMapsAndRelatedFlatEntityMaps:
+            skillResult.optimisticFlatEntityMapsAndRelatedFlatEntityMaps,
+        },
+      );
+
+      if (skillResult.status === 'fail') {
+        orchestratorFailureReport.skill.push(...skillResult.errors);
+      } else {
+        orchestratorActionsReport.skill = skillResult.actions;
+      }
+    }
+
     if (isDefined(flatPageLayoutMaps)) {
       const { from: fromFlatPageLayoutMaps, to: toFlatPageLayoutMaps } =
         flatPageLayoutMaps;
@@ -988,6 +1021,12 @@ export class WorkspaceMigrationBuildOrchestratorService {
           ...aggregatedOrchestratorActionsReport.agent.updated,
           ///
 
+          // Skills
+          ...aggregatedOrchestratorActionsReport.skill.deleted,
+          ...aggregatedOrchestratorActionsReport.skill.created,
+          ...aggregatedOrchestratorActionsReport.skill.updated,
+          ///
+
           // Page layouts
           ...aggregatedOrchestratorActionsReport.pageLayout.deleted,
           ...aggregatedOrchestratorActionsReport.pageLayout.created,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/skill/types/workspace-migration-v2-skill-action.type.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/skill/types/workspace-migration-v2-skill-action.type.ts
new file mode 100644
index 00000000000..ba6d7b6ed1c
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/skill/types/workspace-migration-v2-skill-action.type.ts
@@ -0,0 +1,18 @@
+import { type FlatSkill } from 'src/engine/metadata-modules/flat-skill/types/flat-skill.type';
+import { type FlatEntityPropertiesUpdates } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-properties-updates.type';
+
+export type UpdateSkillAction = {
+  type: 'update_skill';
+  flatEntityId: string;
+  flatEntityUpdates: FlatEntityPropertiesUpdates<'skill'>;
+};
+
+export type CreateSkillAction = {
+  type: 'create_skill';
+  flatEntity: FlatSkill;
+};
+
+export type DeleteSkillAction = {
+  type: 'delete_skill';
+  flatEntityId: string;
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/skill/workspace-migration-v2-skill-actions-builder.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/skill/workspace-migration-v2-skill-actions-builder.service.ts
new file mode 100644
index 00000000000..56abd414b05
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/skill/workspace-migration-v2-skill-actions-builder.service.ts
@@ -0,0 +1,96 @@
+import { Injectable } from '@nestjs/common';
+
+import { ALL_METADATA_NAME } from 'twenty-shared/metadata';
+
+import { UpdateSkillAction } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/skill/types/workspace-migration-v2-skill-action.type';
+import { WorkspaceEntityMigrationBuilderV2Service } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/services/workspace-entity-migration-builder-v2.service';
+import { FlatEntityUpdateValidationArgs } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/types/flat-entity-update-validation-args.type';
+import { FlatEntityValidationArgs } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/types/flat-entity-validation-args.type';
+import { FlatEntityValidationReturnType } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/types/flat-entity-validation-result.type';
+import { FlatSkillValidatorService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/services/flat-skill-validator.service';
+
+@Injectable()
+export class WorkspaceMigrationV2SkillActionsBuilderService extends WorkspaceEntityMigrationBuilderV2Service<
+  typeof ALL_METADATA_NAME.skill
+> {
+  constructor(
+    private readonly flatSkillValidatorService: FlatSkillValidatorService,
+  ) {
+    super(ALL_METADATA_NAME.skill);
+  }
+
+  protected validateFlatEntityCreation(
+    args: FlatEntityValidationArgs<typeof ALL_METADATA_NAME.skill>,
+  ): FlatEntityValidationReturnType<typeof ALL_METADATA_NAME.skill, 'created'> {
+    const validationResult =
+      this.flatSkillValidatorService.validateFlatSkillCreation(args);
+
+    if (validationResult.errors.length > 0) {
+      return {
+        status: 'fail',
+        ...validationResult,
+      };
+    }
+
+    const { flatEntityToValidate: flatSkillToValidate } = args;
+
+    return {
+      status: 'success',
+      action: {
+        type: 'create_skill',
+        flatEntity: flatSkillToValidate,
+      },
+    };
+  }
+
+  protected validateFlatEntityDeletion(
+    args: FlatEntityValidationArgs<typeof ALL_METADATA_NAME.skill>,
+  ): FlatEntityValidationReturnType<typeof ALL_METADATA_NAME.skill, 'deleted'> {
+    const validationResult =
+      this.flatSkillValidatorService.validateFlatSkillDeletion(args);
+
+    if (validationResult.errors.length > 0) {
+      return {
+        status: 'fail',
+        ...validationResult,
+      };
+    }
+
+    const { flatEntityToValidate: flatSkillToValidate } = args;
+
+    return {
+      status: 'success',
+      action: {
+        type: 'delete_skill',
+        flatEntityId: flatSkillToValidate.id,
+      },
+    };
+  }
+
+  protected validateFlatEntityUpdate(
+    args: FlatEntityUpdateValidationArgs<typeof ALL_METADATA_NAME.skill>,
+  ): FlatEntityValidationReturnType<typeof ALL_METADATA_NAME.skill, 'updated'> {
+    const validationResult =
+      this.flatSkillValidatorService.validateFlatSkillUpdate(args);
+
+    if (validationResult.errors.length > 0) {
+      return {
+        status: 'fail',
+        ...validationResult,
+      };
+    }
+
+    const { flatEntityId, flatEntityUpdates } = args;
+
+    const updateSkillAction: UpdateSkillAction = {
+      type: 'update_skill',
+      flatEntityId,
+      flatEntityUpdates,
+    };
+
+    return {
+      status: 'success',
+      action: updateSkillAction,
+    };
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/services/flat-skill-validator.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/services/flat-skill-validator.service.ts
new file mode 100644
index 00000000000..319c5bd4bf6
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/services/flat-skill-validator.service.ts
@@ -0,0 +1,217 @@
+import { Injectable } from '@nestjs/common';
+
+import { msg, t } from '@lingui/core/macro';
+import { type ALL_METADATA_NAME } from 'twenty-shared/metadata';
+import { isDefined } from 'twenty-shared/utils';
+
+import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
+import { type FlatSkill } from 'src/engine/metadata-modules/flat-skill/types/flat-skill.type';
+import { SkillExceptionCode } from 'src/engine/metadata-modules/skill/skill.exception';
+import { isStandardMetadata } from 'src/engine/metadata-modules/utils/is-standard-metadata.util';
+import { findFlatEntityPropertyUpdate } from 'src/engine/workspace-manager/workspace-migration-v2/utils/find-flat-entity-property-update.util';
+import { type FailedFlatEntityValidation } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/types/failed-flat-entity-validation.type';
+import { type FlatEntityUpdateValidationArgs } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/types/flat-entity-update-validation-args.type';
+import { type FlatEntityValidationArgs } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/types/flat-entity-validation-args.type';
+import { validateSkillNameUniqueness } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/utils/validate-skill-name-uniqueness.util';
+import {
+  validateSkillContentIsDefined,
+  validateSkillLabelIsDefined,
+  validateSkillRequiredProperties,
+} from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/utils/validate-skill-required-properties.util';
+import { fromFlatEntityPropertiesUpdatesToPartialFlatEntity } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/utils/from-flat-entity-properties-updates-to-partial-flat-entity';
+
+@Injectable()
+export class FlatSkillValidatorService {
+  public validateFlatSkillCreation({
+    flatEntityToValidate: flatSkill,
+    optimisticFlatEntityMapsAndRelatedFlatEntityMaps: {
+      flatSkillMaps: optimisticFlatSkillMaps,
+    },
+  }: FlatEntityValidationArgs<
+    typeof ALL_METADATA_NAME.skill
+  >): FailedFlatEntityValidation<FlatSkill> {
+    const validationResult: FailedFlatEntityValidation<FlatSkill> = {
+      type: 'create_skill',
+      errors: [],
+      flatEntityMinimalInformation: {
+        id: flatSkill.id,
+        name: flatSkill.name,
+      },
+    };
+
+    const existingSkills = Object.values(optimisticFlatSkillMaps.byId).filter(
+      isDefined,
+    );
+
+    validationResult.errors.push(
+      ...validateSkillRequiredProperties({ flatSkill }),
+    );
+
+    validationResult.errors.push(
+      ...validateSkillNameUniqueness({
+        name: flatSkill.name,
+        existingFlatSkills: existingSkills,
+      }),
+    );
+
+    return validationResult;
+  }
+
+  public validateFlatSkillDeletion({
+    flatEntityToValidate,
+    optimisticFlatEntityMapsAndRelatedFlatEntityMaps: {
+      flatSkillMaps: optimisticFlatSkillMaps,
+    },
+    buildOptions,
+  }: FlatEntityValidationArgs<
+    typeof ALL_METADATA_NAME.skill
+  >): FailedFlatEntityValidation<FlatSkill> {
+    const validationResult: FailedFlatEntityValidation<FlatSkill> = {
+      type: 'delete_skill',
+      errors: [],
+      flatEntityMinimalInformation: {
+        id: flatEntityToValidate.id,
+        name: flatEntityToValidate.name,
+      },
+    };
+
+    const existingSkill = findFlatEntityByIdInFlatEntityMaps({
+      flatEntityId: flatEntityToValidate.id,
+      flatEntityMaps: optimisticFlatSkillMaps,
+    });
+
+    if (!isDefined(existingSkill)) {
+      validationResult.errors.push({
+        code: SkillExceptionCode.SKILL_NOT_FOUND,
+        message: t`Skill not found`,
+        userFriendlyMessage: msg`Skill not found`,
+      });
+
+      return validationResult;
+    }
+
+    if (!buildOptions.isSystemBuild && isStandardMetadata(existingSkill)) {
+      validationResult.errors.push({
+        code: SkillExceptionCode.SKILL_IS_STANDARD,
+        message: t`Cannot delete standard skill`,
+        userFriendlyMessage: msg`Cannot delete standard skill`,
+      });
+    }
+
+    return validationResult;
+  }
+
+  public validateFlatSkillUpdate({
+    flatEntityId,
+    flatEntityUpdates,
+    optimisticFlatEntityMapsAndRelatedFlatEntityMaps: {
+      flatSkillMaps: optimisticFlatSkillMaps,
+    },
+    buildOptions,
+  }: FlatEntityUpdateValidationArgs<
+    typeof ALL_METADATA_NAME.skill
+  >): FailedFlatEntityValidation<FlatSkill> {
+    const validationResult: FailedFlatEntityValidation<FlatSkill> = {
+      type: 'update_skill',
+      errors: [],
+      flatEntityMinimalInformation: {
+        id: flatEntityId,
+      },
+    };
+
+    const fromFlatSkill = findFlatEntityByIdInFlatEntityMaps({
+      flatEntityId,
+      flatEntityMaps: optimisticFlatSkillMaps,
+    });
+
+    if (!isDefined(fromFlatSkill)) {
+      validationResult.errors.push({
+        code: SkillExceptionCode.SKILL_NOT_FOUND,
+        message: t`Skill not found`,
+        userFriendlyMessage: msg`Skill not found`,
+      });
+
+      return validationResult;
+    }
+
+    // Standard skills can only have isActive toggled, not other properties
+    const isActiveUpdate = findFlatEntityPropertyUpdate({
+      flatEntityUpdates,
+      property: 'isActive',
+    });
+
+    const hasNonIsActiveUpdates = flatEntityUpdates.some(
+      (update) => update.property !== 'isActive',
+    );
+
+    if (
+      !buildOptions.isSystemBuild &&
+      isStandardMetadata(fromFlatSkill) &&
+      hasNonIsActiveUpdates
+    ) {
+      validationResult.errors.push({
+        code: SkillExceptionCode.SKILL_IS_STANDARD,
+        message: t`Cannot update standard skill properties (only activation/deactivation allowed)`,
+        userFriendlyMessage: msg`Cannot update standard skill properties (only activation/deactivation allowed)`,
+      });
+    }
+
+    // If only isActive is being updated on a standard skill, allow it
+    if (
+      isStandardMetadata(fromFlatSkill) &&
+      isDefined(isActiveUpdate) &&
+      !hasNonIsActiveUpdates
+    ) {
+      return validationResult;
+    }
+
+    const optimisticFlatSkill: FlatSkill = {
+      ...fromFlatSkill,
+      ...fromFlatEntityPropertiesUpdatesToPartialFlatEntity({
+        updates: flatEntityUpdates,
+      }),
+    };
+
+    const labelUpdate = findFlatEntityPropertyUpdate({
+      flatEntityUpdates,
+      property: 'label',
+    });
+
+    if (isDefined(labelUpdate)) {
+      validationResult.errors.push(
+        ...validateSkillLabelIsDefined({ flatSkill: optimisticFlatSkill }),
+      );
+    }
+
+    const contentUpdate = findFlatEntityPropertyUpdate({
+      flatEntityUpdates,
+      property: 'content',
+    });
+
+    if (isDefined(contentUpdate)) {
+      validationResult.errors.push(
+        ...validateSkillContentIsDefined({ flatSkill: optimisticFlatSkill }),
+      );
+    }
+
+    const nameUpdate = findFlatEntityPropertyUpdate({
+      flatEntityUpdates,
+      property: 'name',
+    });
+
+    if (isDefined(nameUpdate)) {
+      const existingSkills = Object.values(optimisticFlatSkillMaps.byId)
+        .filter(isDefined)
+        .filter((skill) => skill.id !== flatEntityId);
+
+      validationResult.errors.push(
+        ...validateSkillNameUniqueness({
+          name: nameUpdate.to,
+          existingFlatSkills: existingSkills,
+        }),
+      );
+    }
+
+    return validationResult;
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/utils/validate-skill-name-uniqueness.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/utils/validate-skill-name-uniqueness.util.ts
new file mode 100644
index 00000000000..bfb7f74f90f
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/utils/validate-skill-name-uniqueness.util.ts
@@ -0,0 +1,25 @@
+import { msg, t } from '@lingui/core/macro';
+
+import { SkillExceptionCode } from 'src/engine/metadata-modules/skill/skill.exception';
+import { type FlatSkill } from 'src/engine/metadata-modules/flat-skill/types/flat-skill.type';
+import { type FlatEntityValidationError } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/types/failed-flat-entity-validation.type';
+
+export const validateSkillNameUniqueness = ({
+  name,
+  existingFlatSkills,
+}: {
+  name: string;
+  existingFlatSkills: FlatSkill[];
+}): FlatEntityValidationError<SkillExceptionCode>[] => {
+  const errors: FlatEntityValidationError<SkillExceptionCode>[] = [];
+
+  if (existingFlatSkills.some((skill) => skill.name === name)) {
+    errors.push({
+      code: SkillExceptionCode.SKILL_ALREADY_EXISTS,
+      message: t`Skill with name "${name}" already exists`,
+      userFriendlyMessage: msg`A skill with this name already exists`,
+    });
+  }
+
+  return errors;
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/utils/validate-skill-required-properties.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/utils/validate-skill-required-properties.util.ts
new file mode 100644
index 00000000000..5fdd019f2b9
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/utils/validate-skill-required-properties.util.ts
@@ -0,0 +1,51 @@
+import { msg, t } from '@lingui/core/macro';
+import { isNonEmptyString } from '@sniptt/guards';
+
+import { type FlatSkill } from 'src/engine/metadata-modules/flat-skill/types/flat-skill.type';
+import { SkillExceptionCode } from 'src/engine/metadata-modules/skill/skill.exception';
+import { type FlatEntityValidationError } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/types/failed-flat-entity-validation.type';
+
+export const validateSkillLabelIsDefined = ({
+  flatSkill,
+}: {
+  flatSkill: FlatSkill;
+}): FlatEntityValidationError<SkillExceptionCode>[] => {
+  if (isNonEmptyString(flatSkill.label)) {
+    return [];
+  }
+
+  return [
+    {
+      code: SkillExceptionCode.INVALID_SKILL_INPUT,
+      message: t`Label cannot be empty`,
+      userFriendlyMessage: msg`Label cannot be empty`,
+    },
+  ];
+};
+
+export const validateSkillContentIsDefined = ({
+  flatSkill,
+}: {
+  flatSkill: FlatSkill;
+}): FlatEntityValidationError<SkillExceptionCode>[] => {
+  if (isNonEmptyString(flatSkill.content)) {
+    return [];
+  }
+
+  return [
+    {
+      code: SkillExceptionCode.INVALID_SKILL_INPUT,
+      message: t`Content cannot be empty`,
+      userFriendlyMessage: msg`Content cannot be empty`,
+    },
+  ];
+};
+
+export const validateSkillRequiredProperties = ({
+  flatSkill,
+}: {
+  flatSkill: FlatSkill;
+}): FlatEntityValidationError<SkillExceptionCode>[] => [
+  ...validateSkillLabelIsDefined({ flatSkill }),
+  ...validateSkillContentIsDefined({ flatSkill }),
+];
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/workspace-migration-builder-validators.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/workspace-migration-builder-validators.module.ts
index 8bbb7bfd8c3..9ac3efbda77 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/workspace-migration-builder-validators.module.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/workspace-migration-builder-validators.module.ts
@@ -3,6 +3,7 @@ import { Module } from '@nestjs/common';
 import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
 import { FlatFieldMetadataTypeValidatorService } from 'src/engine/metadata-modules/flat-field-metadata/services/flat-field-metadata-type-validator.service';
 import { FlatAgentValidatorService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/services/flat-agent-validator.service';
+import { FlatSkillValidatorService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/services/flat-skill-validator.service';
 import { FlatCronTriggerValidatorService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/services/flat-cron-trigger-validator.service';
 import { FlatDatabaseEventTriggerValidatorService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/services/flat-database-event-trigger-validator.service';
 import { FlatFieldMetadataValidatorService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/services/flat-field-metadata-validator.service';
@@ -42,6 +43,7 @@ import { FlatViewValidatorService } from 'src/engine/workspace-manager/workspace
     FlatRoleValidatorService,
     FlatRoleTargetValidatorService,
     FlatAgentValidatorService,
+    FlatSkillValidatorService,
     FlatPageLayoutValidatorService,
     FlatPageLayoutWidgetValidatorService,
     FlatPageLayoutTabValidatorService,
@@ -65,6 +67,7 @@ import { FlatViewValidatorService } from 'src/engine/workspace-manager/workspace
     FlatRoleValidatorService,
     FlatRoleTargetValidatorService,
     FlatAgentValidatorService,
+    FlatSkillValidatorService,
     FlatPageLayoutValidatorService,
     FlatPageLayoutWidgetValidatorService,
     FlatPageLayoutTabValidatorService,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/workspace-migration-builder-v2.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/workspace-migration-builder-v2.module.ts
index ca652249357..20aec2e2784 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/workspace-migration-builder-v2.module.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/workspace-migration-builder-v2.module.ts
@@ -3,6 +3,7 @@ import { Module } from '@nestjs/common';
 import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
 import { FlatFieldMetadataTypeValidatorService } from 'src/engine/metadata-modules/flat-field-metadata/services/flat-field-metadata-type-validator.service';
 import { WorkspaceMigrationV2AgentActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/agent/workspace-migration-v2-agent-actions-builder.service';
+import { WorkspaceMigrationV2SkillActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/skill/workspace-migration-v2-skill-actions-builder.service';
 import { WorkspaceMigrationV2CronTriggerActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/cron-trigger/workspace-migration-v2-cron-trigger-action-builder.service';
 import { WorkspaceMigrationV2DatabaseEventTriggerActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/database-event-trigger/workspace-migration-v2-database-event-trigger-actions-builder.service';
 import { WorkspaceMigrationV2FieldActionsBuilderService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/field/workspace-migration-v2-field-actions-builder.service';
@@ -43,6 +44,7 @@ import { WorkspaceMigrationBuilderValidatorsModule } from 'src/engine/workspace-
     WorkspaceMigrationV2RoleActionsBuilderService,
     WorkspaceMigrationV2RoleTargetActionsBuilderService,
     WorkspaceMigrationV2AgentActionsBuilderService,
+    WorkspaceMigrationV2SkillActionsBuilderService,
     WorkspaceMigrationV2PageLayoutActionsBuilderService,
     WorkspaceMigrationV2PageLayoutWidgetActionsBuilderService,
     WorkspaceMigrationV2PageLayoutTabActionsBuilderService,
@@ -65,6 +67,7 @@ import { WorkspaceMigrationBuilderValidatorsModule } from 'src/engine/workspace-
     WorkspaceMigrationV2RoleActionsBuilderService,
     WorkspaceMigrationV2RoleTargetActionsBuilderService,
     WorkspaceMigrationV2AgentActionsBuilderService,
+    WorkspaceMigrationV2SkillActionsBuilderService,
     WorkspaceMigrationV2PageLayoutActionsBuilderService,
     WorkspaceMigrationV2PageLayoutWidgetActionsBuilderService,
     WorkspaceMigrationV2PageLayoutTabActionsBuilderService,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/skill/services/create-skill-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/skill/services/create-skill-action-handler.service.ts
new file mode 100644
index 00000000000..da0c4ad2633
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/skill/services/create-skill-action-handler.service.ts
@@ -0,0 +1,59 @@
+import { Injectable } from '@nestjs/common';
+
+import {
+  OptimisticallyApplyActionOnAllFlatEntityMapsArgs,
+  WorkspaceMigrationRunnerActionHandler,
+} from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/interfaces/workspace-migration-runner-action-handler-service.interface';
+
+import { SkillEntity } from 'src/engine/metadata-modules/skill/entities/skill.entity';
+import { AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
+import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';
+import { CreateSkillAction } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/skill/types/workspace-migration-v2-skill-action.type';
+import { WorkspaceMigrationActionRunnerArgs } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/types/workspace-migration-action-runner-args.type';
+
+@Injectable()
+export class CreateSkillActionHandlerService extends WorkspaceMigrationRunnerActionHandler(
+  'create_skill',
+) {
+  constructor() {
+    super();
+  }
+
+  optimisticallyApplyActionOnAllFlatEntityMaps({
+    action,
+    allFlatEntityMaps,
+  }: OptimisticallyApplyActionOnAllFlatEntityMapsArgs<CreateSkillAction>): Partial<AllFlatEntityMaps> {
+    const { flatSkillMaps } = allFlatEntityMaps;
+    const { flatEntity } = action;
+
+    const updatedFlatSkillMaps = addFlatEntityToFlatEntityMapsOrThrow({
+      flatEntity,
+      flatEntityMaps: flatSkillMaps,
+    });
+
+    return {
+      flatSkillMaps: updatedFlatSkillMaps,
+    };
+  }
+
+  async executeForMetadata(
+    context: WorkspaceMigrationActionRunnerArgs<CreateSkillAction>,
+  ): Promise<void> {
+    const { action, queryRunner, workspaceId } = context;
+    const { flatEntity } = action;
+
+    const skillRepository =
+      queryRunner.manager.getRepository<SkillEntity>(SkillEntity);
+
+    await skillRepository.save({
+      ...flatEntity,
+      workspaceId,
+    });
+  }
+
+  async executeForWorkspaceSchema(
+    _context: WorkspaceMigrationActionRunnerArgs<CreateSkillAction>,
+  ): Promise<void> {
+    return;
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/skill/services/delete-skill-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/skill/services/delete-skill-action-handler.service.ts
new file mode 100644
index 00000000000..1a9f983d145
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/skill/services/delete-skill-action-handler.service.ts
@@ -0,0 +1,56 @@
+import { Injectable } from '@nestjs/common';
+
+import {
+  OptimisticallyApplyActionOnAllFlatEntityMapsArgs,
+  WorkspaceMigrationRunnerActionHandler,
+} from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/interfaces/workspace-migration-runner-action-handler-service.interface';
+
+import { SkillEntity } from 'src/engine/metadata-modules/skill/entities/skill.entity';
+import { AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
+import { deleteFlatEntityFromFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/delete-flat-entity-from-flat-entity-maps-or-throw.util';
+import { DeleteSkillAction } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/skill/types/workspace-migration-v2-skill-action.type';
+import { WorkspaceMigrationActionRunnerArgs } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/types/workspace-migration-action-runner-args.type';
+
+@Injectable()
+export class DeleteSkillActionHandlerService extends WorkspaceMigrationRunnerActionHandler(
+  'delete_skill',
+) {
+  constructor() {
+    super();
+  }
+
+  optimisticallyApplyActionOnAllFlatEntityMaps({
+    action,
+    allFlatEntityMaps,
+  }: OptimisticallyApplyActionOnAllFlatEntityMapsArgs<DeleteSkillAction>): Partial<AllFlatEntityMaps> {
+    const { flatSkillMaps } = allFlatEntityMaps;
+    const { flatEntityId } = action;
+
+    const updatedFlatSkillMaps = deleteFlatEntityFromFlatEntityMapsOrThrow({
+      entityToDeleteId: flatEntityId,
+      flatEntityMaps: flatSkillMaps,
+    });
+
+    return {
+      flatSkillMaps: updatedFlatSkillMaps,
+    };
+  }
+
+  async executeForMetadata(
+    context: WorkspaceMigrationActionRunnerArgs<DeleteSkillAction>,
+  ): Promise<void> {
+    const { action, queryRunner, workspaceId } = context;
+    const { flatEntityId } = action;
+
+    const skillRepository =
+      queryRunner.manager.getRepository<SkillEntity>(SkillEntity);
+
+    await skillRepository.delete({ id: flatEntityId, workspaceId });
+  }
+
+  async executeForWorkspaceSchema(
+    _context: WorkspaceMigrationActionRunnerArgs<DeleteSkillAction>,
+  ): Promise<void> {
+    return;
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/skill/services/update-skill-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/skill/services/update-skill-action-handler.service.ts
new file mode 100644
index 00000000000..8955116318b
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/skill/services/update-skill-action-handler.service.ts
@@ -0,0 +1,71 @@
+import { Injectable } from '@nestjs/common';
+
+import {
+  OptimisticallyApplyActionOnAllFlatEntityMapsArgs,
+  WorkspaceMigrationRunnerActionHandler,
+} from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/interfaces/workspace-migration-runner-action-handler-service.interface';
+
+import { SkillEntity } from 'src/engine/metadata-modules/skill/entities/skill.entity';
+import { AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
+import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
+import { replaceFlatEntityInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/replace-flat-entity-in-flat-entity-maps-or-throw.util';
+import { UpdateSkillAction } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/skill/types/workspace-migration-v2-skill-action.type';
+import { WorkspaceMigrationActionRunnerArgs } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/types/workspace-migration-action-runner-args.type';
+import { fromFlatEntityPropertiesUpdatesToPartialFlatEntity } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/utils/from-flat-entity-properties-updates-to-partial-flat-entity';
+
+@Injectable()
+export class UpdateSkillActionHandlerService extends WorkspaceMigrationRunnerActionHandler(
+  'update_skill',
+) {
+  optimisticallyApplyActionOnAllFlatEntityMaps({
+    action,
+    allFlatEntityMaps,
+  }: OptimisticallyApplyActionOnAllFlatEntityMapsArgs<UpdateSkillAction>): Partial<AllFlatEntityMaps> {
+    const { flatSkillMaps } = allFlatEntityMaps;
+    const { flatEntityId, flatEntityUpdates } = action;
+
+    const existingSkill = findFlatEntityByIdInFlatEntityMapsOrThrow({
+      flatEntityId,
+      flatEntityMaps: flatSkillMaps,
+    });
+
+    const updatedSkill = {
+      ...existingSkill,
+      ...fromFlatEntityPropertiesUpdatesToPartialFlatEntity({
+        updates: flatEntityUpdates,
+      }),
+    };
+
+    const updatedFlatSkillMaps = replaceFlatEntityInFlatEntityMapsOrThrow({
+      flatEntity: updatedSkill,
+      flatEntityMaps: flatSkillMaps,
+    });
+
+    return {
+      flatSkillMaps: updatedFlatSkillMaps,
+    };
+  }
+
+  async executeForMetadata(
+    context: WorkspaceMigrationActionRunnerArgs<UpdateSkillAction>,
+  ): Promise<void> {
+    const { action, queryRunner, workspaceId } = context;
+    const { flatEntityId, flatEntityUpdates } = action;
+
+    const skillRepository =
+      queryRunner.manager.getRepository<SkillEntity>(SkillEntity);
+
+    await skillRepository.update(
+      { id: flatEntityId, workspaceId },
+      fromFlatEntityPropertiesUpdatesToPartialFlatEntity({
+        updates: flatEntityUpdates,
+      }),
+    );
+  }
+
+  async executeForWorkspaceSchema(
+    _context: WorkspaceMigrationActionRunnerArgs<UpdateSkillAction>,
+  ): Promise<void> {
+    return;
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/workspace-schema-migration-runner-action-handlers.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/workspace-schema-migration-runner-action-handlers.module.ts
index fff9d9b1e65..c76d9378125 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/workspace-schema-migration-runner-action-handlers.module.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/workspace-schema-migration-runner-action-handlers.module.ts
@@ -4,6 +4,9 @@ import { WorkspaceSchemaManagerModule } from 'src/engine/twenty-orm/workspace-sc
 import { CreateAgentActionHandlerService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/agent/services/create-agent-action-handler.service';
 import { DeleteAgentActionHandlerService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/agent/services/delete-agent-action-handler.service';
 import { UpdateAgentActionHandlerService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/agent/services/update-agent-action-handler.service';
+import { CreateSkillActionHandlerService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/skill/services/create-skill-action-handler.service';
+import { DeleteSkillActionHandlerService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/skill/services/delete-skill-action-handler.service';
+import { UpdateSkillActionHandlerService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/skill/services/update-skill-action-handler.service';
 import { CreateCronTriggerActionHandlerService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/cron-trigger/services/create-cron-trigger-action-handler.service';
 import { DeleteCronTriggerActionHandlerService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/cron-trigger/services/delete-cron-trigger-action-handler.service';
 import { UpdateCronTriggerActionHandlerService } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/cron-trigger/services/update-cron-trigger-action-handler.service';
@@ -123,6 +126,10 @@ import { UpdateViewActionHandlerService } from 'src/engine/workspace-manager/wor
     UpdateAgentActionHandlerService,
     DeleteAgentActionHandlerService,
 
+    CreateSkillActionHandlerService,
+    UpdateSkillActionHandlerService,
+    DeleteSkillActionHandlerService,
+
     CreatePageLayoutActionHandlerService,
     UpdatePageLayoutActionHandlerService,
     DeletePageLayoutActionHandlerService,
diff --git a/packages/twenty-server/test/integration/graphql/suites/view/view-field/__snapshots__/failing-create-many-view-fields-v2.integration-spec.ts.snap b/packages/twenty-server/test/integration/graphql/suites/view/view-field/__snapshots__/failing-create-many-view-fields-v2.integration-spec.ts.snap
index 0772853afce..7684b47f835 100644
--- a/packages/twenty-server/test/integration/graphql/suites/view/view-field/__snapshots__/failing-create-many-view-fields-v2.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/graphql/suites/view/view-field/__snapshots__/failing-create-many-view-fields-v2.integration-spec.ts.snap
@@ -20,6 +20,7 @@ exports[`View Field Resolver - Failing Create Many Operations - v2 should accumu
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [
         {
@@ -97,6 +98,7 @@ exports[`View Field Resolver - Failing Create Many Operations - v2 should accumu
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/graphql/suites/view/view-field/__snapshots__/failing-create-view-field-v2.integration-spec.ts.snap b/packages/twenty-server/test/integration/graphql/suites/view/view-field/__snapshots__/failing-create-view-field-v2.integration-spec.ts.snap
index fc38c8bfe19..6aa3a1e999b 100644
--- a/packages/twenty-server/test/integration/graphql/suites/view/view-field/__snapshots__/failing-create-view-field-v2.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/graphql/suites/view/view-field/__snapshots__/failing-create-view-field-v2.integration-spec.ts.snap
@@ -20,6 +20,7 @@ exports[`View Field Resolver - Failing Create Operation - v2 Should fail to crea
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [
         {
@@ -60,6 +61,7 @@ exports[`View Field Resolver - Failing Create Operation - v2 Should fail to crea
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -94,6 +96,7 @@ exports[`View Field Resolver - Failing Create Operation - v2 should fail to crea
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [
         {
@@ -134,6 +137,7 @@ exports[`View Field Resolver - Failing Create Operation - v2 should fail to crea
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -168,6 +172,7 @@ exports[`View Field Resolver - Failing Create Operation - v2 should fail to crea
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [
         {
@@ -208,6 +213,7 @@ exports[`View Field Resolver - Failing Create Operation - v2 should fail to crea
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/graphql/suites/view/view-field/__snapshots__/object-identifier-update-side-effect-on-view-field.integration-spec.ts.snap b/packages/twenty-server/test/integration/graphql/suites/view/view-field/__snapshots__/object-identifier-update-side-effect-on-view-field.integration-spec.ts.snap
index 93eca0cf71e..6a73f170ea0 100644
--- a/packages/twenty-server/test/integration/graphql/suites/view/view-field/__snapshots__/object-identifier-update-side-effect-on-view-field.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/graphql/suites/view/view-field/__snapshots__/object-identifier-update-side-effect-on-view-field.integration-spec.ts.snap
@@ -20,6 +20,7 @@ exports[`View Field Resolver - Successful object metadata identifier update side
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [
         {
@@ -60,6 +61,7 @@ exports[`View Field Resolver - Successful object metadata identifier update side
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -94,6 +96,7 @@ exports[`View Field Resolver - Successful object metadata identifier update side
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [
         {
@@ -134,6 +137,7 @@ exports[`View Field Resolver - Successful object metadata identifier update side
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -168,6 +172,7 @@ exports[`View Field Resolver - Successful object metadata identifier update side
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [
         {
@@ -206,6 +211,7 @@ exports[`View Field Resolver - Successful object metadata identifier update side
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -240,6 +246,7 @@ exports[`View Field Resolver - Successful object metadata identifier update side
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [
         {
@@ -280,6 +287,7 @@ exports[`View Field Resolver - Successful object metadata identifier update side
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -314,6 +322,7 @@ exports[`View Field Resolver - Successful object metadata identifier update side
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [
         {
@@ -354,6 +363,7 @@ exports[`View Field Resolver - Successful object metadata identifier update side
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/agent/__snapshots__/failing-agent-creation.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/agent/__snapshots__/failing-agent-creation.integration-spec.ts.snap
index ef79ff5ad75..def0c5aed9e 100644
--- a/packages/twenty-server/test/integration/metadata/suites/agent/__snapshots__/failing-agent-creation.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/agent/__snapshots__/failing-agent-creation.integration-spec.ts.snap
@@ -36,6 +36,7 @@ exports[`Agent creation should fail when computed name already exists 1`] = `
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -59,6 +60,7 @@ exports[`Agent creation should fail when computed name already exists 1`] = `
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -109,6 +111,7 @@ exports[`Agent creation should fail when label is empty string 1`] = `
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -132,6 +135,7 @@ exports[`Agent creation should fail when label is empty string 1`] = `
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -196,6 +200,7 @@ exports[`Agent creation should fail when modelId is empty string 1`] = `
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -219,6 +224,7 @@ exports[`Agent creation should fail when modelId is empty string 1`] = `
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -283,6 +289,7 @@ exports[`Agent creation should fail when prompt is empty string 1`] = `
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -306,6 +313,7 @@ exports[`Agent creation should fail when prompt is empty string 1`] = `
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -370,6 +378,7 @@ exports[`Agent creation should fail when responseFormat has invalid type 1`] = `
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -393,6 +402,7 @@ exports[`Agent creation should fail when responseFormat has invalid type 1`] = `
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -443,6 +453,7 @@ exports[`Agent creation should fail when responseFormat type is json but schema
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -466,6 +477,7 @@ exports[`Agent creation should fail when responseFormat type is json but schema
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -516,6 +528,7 @@ exports[`Agent creation should fail when responseFormat type is text but schema
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -539,6 +552,7 @@ exports[`Agent creation should fail when responseFormat type is text but schema
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/agent/__snapshots__/failing-agent-deletion.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/agent/__snapshots__/failing-agent-deletion.integration-spec.ts.snap
index 0c86d382179..85463d0cb0c 100644
--- a/packages/twenty-server/test/integration/metadata/suites/agent/__snapshots__/failing-agent-deletion.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/agent/__snapshots__/failing-agent-deletion.integration-spec.ts.snap
@@ -36,6 +36,7 @@ exports[`Agent deletion should fail should fail when attempting to delete a stan
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -59,6 +60,7 @@ exports[`Agent deletion should fail should fail when attempting to delete a stan
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/agent/__snapshots__/failing-agent-update.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/agent/__snapshots__/failing-agent-update.integration-spec.ts.snap
index d3905826112..4d287fcfc6c 100644
--- a/packages/twenty-server/test/integration/metadata/suites/agent/__snapshots__/failing-agent-update.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/agent/__snapshots__/failing-agent-update.integration-spec.ts.snap
@@ -35,6 +35,7 @@ exports[`Agent update should fail should fail when attempting to update a standa
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -58,6 +59,7 @@ exports[`Agent update should fail should fail when attempting to update a standa
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -129,6 +131,7 @@ exports[`Agent update should fail when settings null required properties 1`] = `
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -152,6 +155,7 @@ exports[`Agent update should fail when settings null required properties 1`] = `
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -201,6 +205,7 @@ exports[`Agent update should fail when updating label to one that already exists
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -224,6 +229,7 @@ exports[`Agent update should fail when updating label to one that already exists
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -273,6 +279,7 @@ exports[`Agent update should fail when updating responseFormat type to json with
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -296,6 +303,7 @@ exports[`Agent update should fail when updating responseFormat type to json with
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -345,6 +353,7 @@ exports[`Agent update should fail when updating responseFormat type to text with
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -368,6 +377,7 @@ exports[`Agent update should fail when updating responseFormat type to text with
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -417,6 +427,7 @@ exports[`Agent update should fail when updating responseFormat with invalid type
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -440,6 +451,7 @@ exports[`Agent update should fail when updating responseFormat with invalid type
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -489,6 +501,7 @@ exports[`Agent update should fail when updating with empty label 1`] = `
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -512,6 +525,7 @@ exports[`Agent update should fail when updating with empty label 1`] = `
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -561,6 +575,7 @@ exports[`Agent update should fail when updating with empty modelId 1`] = `
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -584,6 +599,7 @@ exports[`Agent update should fail when updating with empty modelId 1`] = `
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -633,6 +649,7 @@ exports[`Agent update should fail when updating with empty prompt 1`] = `
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -656,6 +673,7 @@ exports[`Agent update should fail when updating with empty prompt 1`] = `
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/__snapshots__/create-one-field-metadata.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/field-metadata/__snapshots__/create-one-field-metadata.integration-spec.ts.snap
index 2970ea39486..d81ff9f1915 100644
--- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/__snapshots__/create-one-field-metadata.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/__snapshots__/create-one-field-metadata.integration-spec.ts.snap
@@ -38,6 +38,7 @@ exports[`createOne FieldMetadataService name/label sync should return an error w
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -61,6 +62,7 @@ exports[`createOne FieldMetadataService name/label sync should return an error w
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/__snapshots__/failing-create-one-field-metadata.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/field-metadata/__snapshots__/failing-create-one-field-metadata.integration-spec.ts.snap
index df92625013b..b912799a96d 100644
--- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/__snapshots__/failing-create-one-field-metadata.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/__snapshots__/failing-create-one-field-metadata.integration-spec.ts.snap
@@ -39,6 +39,7 @@ exports[`Failing create field metadata tests suite should fail to create NUMERIC
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -62,6 +63,7 @@ exports[`Failing create field metadata tests suite should fail to create NUMERIC
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -116,6 +118,7 @@ exports[`Failing create field metadata tests suite should fail to create POSITIO
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -139,6 +142,7 @@ exports[`Failing create field metadata tests suite should fail to create POSITIO
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -186,6 +190,7 @@ exports[`Failing create field metadata tests suite should fail to create TS_VECT
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -209,6 +214,7 @@ exports[`Failing create field metadata tests suite should fail to create TS_VECT
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/__snapshots__/update-one-field-metadata.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/field-metadata/__snapshots__/update-one-field-metadata.integration-spec.ts.snap
index f36ec396c6f..15b6468fc62 100644
--- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/__snapshots__/update-one-field-metadata.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/__snapshots__/update-one-field-metadata.integration-spec.ts.snap
@@ -38,6 +38,7 @@ exports[`updateOne failing update should not update a field name if it is not sy
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -61,6 +62,7 @@ exports[`updateOne failing update should not update a field name if it is not sy
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -120,6 +122,7 @@ exports[`updateOne failing update should throw if the field name is not availabl
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -143,6 +146,7 @@ exports[`updateOne failing update should throw if the field name is not availabl
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/__snapshots__/failing-create-one-field-metadata-enum-v2.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/__snapshots__/failing-create-one-field-metadata-enum-v2.integration-spec.ts.snap
index 31c5d84161e..cbf677db1d8 100644
--- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/__snapshots__/failing-create-one-field-metadata-enum-v2.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/__snapshots__/failing-create-one-field-metadata-enum-v2.integration-spec.ts.snap
@@ -39,6 +39,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -62,6 +63,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -116,6 +118,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -139,6 +142,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -193,6 +197,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -216,6 +221,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -285,6 +291,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -308,6 +315,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -377,6 +385,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -400,6 +409,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -469,6 +479,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -492,6 +503,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -561,6 +573,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -584,6 +597,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -638,6 +652,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -661,6 +676,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -715,6 +731,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -738,6 +755,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -798,6 +816,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -821,6 +840,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -875,6 +895,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -898,6 +919,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -952,6 +974,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -975,6 +998,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1029,6 +1053,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1052,6 +1077,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1124,6 +1150,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1147,6 +1174,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1201,6 +1229,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1224,6 +1253,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1278,6 +1308,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1301,6 +1332,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1355,6 +1387,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1378,6 +1411,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1432,6 +1466,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1455,6 +1490,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1509,6 +1545,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1532,6 +1569,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1586,6 +1624,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1609,6 +1648,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1663,6 +1703,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1686,6 +1727,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1745,6 +1787,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1768,6 +1811,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1821,6 +1865,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1844,6 +1889,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1898,6 +1944,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1921,6 +1968,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1974,6 +2022,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1997,6 +2046,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2057,6 +2107,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2080,6 +2131,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2134,6 +2186,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2157,6 +2210,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2211,6 +2265,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2234,6 +2289,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2288,6 +2344,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2311,6 +2368,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2371,6 +2429,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2394,6 +2453,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2448,6 +2508,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2471,6 +2532,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2525,6 +2587,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2548,6 +2611,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2608,6 +2672,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2631,6 +2696,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2684,6 +2750,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2707,6 +2774,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2760,6 +2828,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2783,6 +2852,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2837,6 +2907,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2860,6 +2931,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2914,6 +2986,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2937,6 +3010,7 @@ exports[`Failing create field metadata MULTI_SELECT tests suite v2 Create should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2997,6 +3071,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3020,6 +3095,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3074,6 +3150,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3097,6 +3174,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3151,6 +3229,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3174,6 +3253,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3243,6 +3323,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3266,6 +3347,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3335,6 +3417,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3358,6 +3441,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3427,6 +3511,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3450,6 +3535,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3519,6 +3605,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3542,6 +3629,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3596,6 +3684,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3619,6 +3708,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3679,6 +3769,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3702,6 +3793,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3756,6 +3848,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3779,6 +3872,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3833,6 +3927,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3856,6 +3951,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3910,6 +4006,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3933,6 +4030,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3987,6 +4085,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4010,6 +4109,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4064,6 +4164,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4087,6 +4188,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4141,6 +4243,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4164,6 +4267,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4218,6 +4322,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4241,6 +4346,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4295,6 +4401,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4318,6 +4425,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4372,6 +4480,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4395,6 +4504,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4454,6 +4564,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4477,6 +4588,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4530,6 +4642,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4553,6 +4666,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4607,6 +4721,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4630,6 +4745,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4683,6 +4799,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4706,6 +4823,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4766,6 +4884,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4789,6 +4908,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4843,6 +4963,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4866,6 +4987,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4920,6 +5042,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4943,6 +5066,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4997,6 +5121,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -5020,6 +5145,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -5080,6 +5206,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -5103,6 +5230,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -5157,6 +5285,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -5180,6 +5309,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -5234,6 +5364,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -5257,6 +5388,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -5317,6 +5449,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -5340,6 +5473,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -5393,6 +5527,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -5416,6 +5551,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -5469,6 +5605,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -5492,6 +5629,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -5546,6 +5684,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -5569,6 +5708,7 @@ exports[`Failing create field metadata SELECT tests suite v2 Create should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/__snapshots__/failing-update-one-enum-field-metadata-v2.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/__snapshots__/failing-update-one-enum-field-metadata-v2.integration-spec.ts.snap
index 0f7c8888b54..ddea75e6f15 100644
--- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/__snapshots__/failing-update-one-enum-field-metadata-v2.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/__snapshots__/failing-update-one-enum-field-metadata-v2.integration-spec.ts.snap
@@ -39,6 +39,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -62,6 +63,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -116,6 +118,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -139,6 +142,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -193,6 +197,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -216,6 +221,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -285,6 +291,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -308,6 +315,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -377,6 +385,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -400,6 +409,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -469,6 +479,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -492,6 +503,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -561,6 +573,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -584,6 +597,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -638,6 +652,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -661,6 +676,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -715,6 +731,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -738,6 +755,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -798,6 +816,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -821,6 +840,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -875,6 +895,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -898,6 +919,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -952,6 +974,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -975,6 +998,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1029,6 +1053,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1052,6 +1077,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1124,6 +1150,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1147,6 +1174,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1201,6 +1229,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1224,6 +1253,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1278,6 +1308,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1301,6 +1332,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1355,6 +1387,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1378,6 +1411,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1432,6 +1466,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1455,6 +1490,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1509,6 +1545,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1532,6 +1569,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1586,6 +1624,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1609,6 +1648,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1663,6 +1703,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1686,6 +1727,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1745,6 +1787,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1768,6 +1811,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1821,6 +1865,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1844,6 +1889,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1897,6 +1943,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1920,6 +1967,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1980,6 +2028,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2003,6 +2052,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2057,6 +2107,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2080,6 +2131,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2134,6 +2186,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2157,6 +2210,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2211,6 +2265,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2234,6 +2289,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2294,6 +2350,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2317,6 +2374,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2371,6 +2429,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2394,6 +2453,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2448,6 +2508,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2471,6 +2532,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2531,6 +2593,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2554,6 +2617,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2607,6 +2671,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2630,6 +2695,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2683,6 +2749,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2706,6 +2773,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2760,6 +2828,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2783,6 +2852,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2837,6 +2907,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2860,6 +2931,7 @@ exports[`Failing update field metadata MULTI_SELECT tests suite v2 Update should
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2920,6 +2992,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2943,6 +3016,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2997,6 +3071,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3020,6 +3095,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3074,6 +3150,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3097,6 +3174,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3166,6 +3244,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3189,6 +3268,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3258,6 +3338,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3281,6 +3362,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3350,6 +3432,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3373,6 +3456,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3442,6 +3526,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3465,6 +3550,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3519,6 +3605,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3542,6 +3629,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3602,6 +3690,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3625,6 +3714,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3679,6 +3769,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3702,6 +3793,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3756,6 +3848,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3779,6 +3872,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3833,6 +3927,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3856,6 +3951,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3910,6 +4006,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -3933,6 +4030,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -3987,6 +4085,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4010,6 +4109,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4064,6 +4164,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4087,6 +4188,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4141,6 +4243,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4164,6 +4267,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4218,6 +4322,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4241,6 +4346,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4295,6 +4401,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4318,6 +4425,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4377,6 +4485,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4400,6 +4509,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4453,6 +4563,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4476,6 +4587,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4529,6 +4641,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4552,6 +4665,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4612,6 +4726,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4635,6 +4750,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4689,6 +4805,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4712,6 +4829,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4766,6 +4884,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4789,6 +4908,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4843,6 +4963,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4866,6 +4987,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -4926,6 +5048,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -4949,6 +5072,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -5003,6 +5127,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -5026,6 +5151,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -5080,6 +5206,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -5103,6 +5230,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -5163,6 +5291,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -5186,6 +5315,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -5239,6 +5369,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -5262,6 +5393,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -5315,6 +5447,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -5338,6 +5471,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -5392,6 +5526,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -5415,6 +5550,7 @@ exports[`Failing update field metadata SELECT tests suite v2 Update should fail
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/morph-relation/__snapshots__/failing-add-one-target-to-metadata-morph-relation-v2.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/field-metadata/morph-relation/__snapshots__/failing-add-one-target-to-metadata-morph-relation-v2.integration-spec.ts.snap
index ce6dbcd975a..911d192b5f4 100644
--- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/morph-relation/__snapshots__/failing-add-one-target-to-metadata-morph-relation-v2.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/morph-relation/__snapshots__/failing-add-one-target-to-metadata-morph-relation-v2.integration-spec.ts.snap
@@ -81,6 +81,7 @@ exports[`updateOne FieldMetadataService morph relation fields v2 - Add one targe
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -104,6 +105,7 @@ exports[`updateOne FieldMetadataService morph relation fields v2 - Add one targe
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -187,6 +189,7 @@ exports[`updateOne FieldMetadataService morph relation fields v2 - Add one targe
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -210,6 +213,7 @@ exports[`updateOne FieldMetadataService morph relation fields v2 - Add one targe
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/morph-relation/__snapshots__/failing-create-one-field-metadata-morph-relation-v2.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/field-metadata/morph-relation/__snapshots__/failing-create-one-field-metadata-morph-relation-v2.integration-spec.ts.snap
index e40610b6c89..3d92aa7d571 100644
--- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/morph-relation/__snapshots__/failing-create-one-field-metadata-morph-relation-v2.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/morph-relation/__snapshots__/failing-create-one-field-metadata-morph-relation-v2.integration-spec.ts.snap
@@ -86,6 +86,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 Morh re
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -109,6 +110,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 Morh re
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -161,6 +163,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 Morh re
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -184,6 +187,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 Morh re
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -230,6 +234,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -253,6 +258,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -299,6 +305,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -322,6 +329,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -396,6 +404,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -419,6 +428,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -487,6 +497,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -510,6 +521,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -578,6 +590,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -601,6 +614,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -675,6 +689,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -698,6 +713,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -752,6 +768,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -775,6 +792,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -829,6 +847,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -852,6 +871,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -905,6 +925,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -928,6 +949,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -974,6 +996,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -997,6 +1020,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -1043,6 +1067,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -1066,6 +1091,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -1112,6 +1138,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -1135,6 +1162,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -1184,6 +1212,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -1207,6 +1236,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -1254,6 +1284,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -1277,6 +1308,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -1323,6 +1355,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -1346,6 +1379,7 @@ exports[`failing createOne FieldMetadataService morph relation fields v2 it shou
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/relation/__snapshots__/failing-field-metadata-relation-creation.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/field-metadata/relation/__snapshots__/failing-field-metadata-relation-creation.integration-spec.ts.snap
index 8ebe43e377c..1675b6af316 100644
--- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/relation/__snapshots__/failing-field-metadata-relation-creation.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/relation/__snapshots__/failing-field-metadata-relation-creation.integration-spec.ts.snap
@@ -38,6 +38,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE (rela
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -61,6 +62,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE (rela
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -113,6 +115,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE (rela
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -136,6 +139,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE (rela
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -194,6 +198,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE (rela
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -217,6 +222,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE (rela
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -269,6 +275,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE (rela
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -292,6 +299,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE (rela
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -350,6 +358,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE (rela
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -373,6 +382,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE (rela
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -425,6 +435,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE (rela
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -448,6 +459,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE (rela
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -500,6 +512,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE (rela
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -523,6 +536,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE (rela
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -575,6 +589,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE (rela
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -598,6 +613,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE (rela
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -649,6 +665,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE (rela
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -672,6 +689,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE (rela
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -756,6 +774,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE when
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -779,6 +798,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE when
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -831,6 +851,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE when
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -854,6 +875,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE when
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -906,6 +928,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE when
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -929,6 +952,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE when
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -1013,6 +1037,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE when
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -1036,6 +1061,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE when
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -1088,6 +1114,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE when
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -1111,6 +1138,7 @@ exports[`Field metadata relation creation should fail relation MANY_TO_ONE when
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -1180,6 +1208,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY (rela
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1203,6 +1232,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY (rela
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1273,6 +1303,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY (rela
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1296,6 +1327,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY (rela
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1372,6 +1404,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY (rela
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1395,6 +1428,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY (rela
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1465,6 +1499,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY (rela
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1488,6 +1523,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY (rela
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1564,6 +1600,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY (rela
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1587,6 +1624,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY (rela
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1641,6 +1679,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY (rela
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1664,6 +1703,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY (rela
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1718,6 +1758,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY (rela
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1741,6 +1782,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY (rela
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1795,6 +1837,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY (rela
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1818,6 +1861,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY (rela
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1871,6 +1915,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY (rela
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -1894,6 +1939,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY (rela
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -1980,6 +2026,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY when
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2003,6 +2050,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY when
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2057,6 +2105,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY when
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2080,6 +2129,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY when
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2134,6 +2184,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY when
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2157,6 +2208,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY when
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2243,6 +2295,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY when
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2266,6 +2319,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY when
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2320,6 +2374,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY when
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -2343,6 +2398,7 @@ exports[`Field metadata relation creation should fail relation ONE_TO_MANY when
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -2396,6 +2452,7 @@ exports[`Field metadata relation creation should fail should fail when creating
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -2419,6 +2476,7 @@ exports[`Field metadata relation creation should fail should fail when creating
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -2487,6 +2545,7 @@ exports[`Field metadata relation creation should fail should fail when creating
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -2510,6 +2569,7 @@ exports[`Field metadata relation creation should fail should fail when creating
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -2594,6 +2654,7 @@ exports[`Field metadata relation creation should fail should fail when creating
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -2617,6 +2678,7 @@ exports[`Field metadata relation creation should fail should fail when creating
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -2701,6 +2763,7 @@ exports[`Field metadata relation creation should fail should fail when creating
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -2724,6 +2787,7 @@ exports[`Field metadata relation creation should fail should fail when creating
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/relation/__snapshots__/failing-field-metadata-relation-update.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/field-metadata/relation/__snapshots__/failing-field-metadata-relation-update.integration-spec.ts.snap
index 7634b2507d9..001b78751a9 100644
--- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/relation/__snapshots__/failing-field-metadata-relation-update.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/relation/__snapshots__/failing-field-metadata-relation-update.integration-spec.ts.snap
@@ -45,6 +45,7 @@ exports[`Field metadata relation update should fail relation when name is not in
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -68,6 +69,7 @@ exports[`Field metadata relation update should fail relation when name is not in
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/unique-field/__snapshots__/create-one-unique-field-metadata.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/field-metadata/unique-field/__snapshots__/create-one-unique-field-metadata.integration-spec.ts.snap
index 28f9f98f3d2..f1b746aed48 100644
--- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/unique-field/__snapshots__/create-one-unique-field-metadata.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/unique-field/__snapshots__/create-one-unique-field-metadata.integration-spec.ts.snap
@@ -36,6 +36,7 @@ exports[`failing createOne unique field metadata should fail for composite type
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -59,6 +60,7 @@ exports[`failing createOne unique field metadata should fail for composite type
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -109,6 +111,7 @@ exports[`failing createOne unique field metadata should fail when field has cust
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -132,6 +135,7 @@ exports[`failing createOne unique field metadata should fail when field has cust
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/object-metadata/__snapshots__/failing-create-one-object-metadata-v2.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/object-metadata/__snapshots__/failing-create-one-object-metadata-v2.integration-spec.ts.snap
index c276bcb5b1c..1fbec55b8b3 100644
--- a/packages/twenty-server/test/integration/metadata/suites/object-metadata/__snapshots__/failing-create-one-object-metadata-v2.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/object-metadata/__snapshots__/failing-create-one-object-metadata-v2.integration-spec.ts.snap
@@ -364,6 +364,7 @@ exports[`Object metadata creation should fail v2 when labelPlural contains only
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [
         {
           "errors": [
@@ -655,6 +656,7 @@ exports[`Object metadata creation should fail v2 when labelPlural contains only
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -1033,6 +1035,7 @@ exports[`Object metadata creation should fail v2 when labelPlural exceeds maximu
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [
         {
           "errors": [
@@ -1324,6 +1327,7 @@ exports[`Object metadata creation should fail v2 when labelPlural exceeds maximu
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -1713,6 +1717,7 @@ exports[`Object metadata creation should fail v2 when labelSingular contains onl
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [
         {
           "errors": [
@@ -2004,6 +2009,7 @@ exports[`Object metadata creation should fail v2 when labelSingular contains onl
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -2382,6 +2388,7 @@ exports[`Object metadata creation should fail v2 when labelSingular exceeds maxi
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [
         {
           "errors": [
@@ -2673,6 +2680,7 @@ exports[`Object metadata creation should fail v2 when labelSingular exceeds maxi
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -3062,6 +3070,7 @@ exports[`Object metadata creation should fail v2 when labels are identical 1`] =
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [
         {
           "errors": [
@@ -3353,6 +3362,7 @@ exports[`Object metadata creation should fail v2 when labels are identical 1`] =
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -3731,6 +3741,7 @@ exports[`Object metadata creation should fail v2 when labels with whitespaces re
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [
         {
           "errors": [
@@ -4022,6 +4033,7 @@ exports[`Object metadata creation should fail v2 when labels with whitespaces re
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -4430,6 +4442,7 @@ exports[`Object metadata creation should fail v2 when name exceeds maximum lengt
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [
         {
           "errors": [
@@ -4721,6 +4734,7 @@ exports[`Object metadata creation should fail v2 when name exceeds maximum lengt
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -5099,6 +5113,7 @@ exports[`Object metadata creation should fail v2 when namePlural has invalid cha
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [
         {
           "errors": [
@@ -5390,6 +5405,7 @@ exports[`Object metadata creation should fail v2 when namePlural has invalid cha
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -5768,6 +5784,7 @@ exports[`Object metadata creation should fail v2 when namePlural is a reserved k
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [
         {
           "errors": [
@@ -6059,6 +6076,7 @@ exports[`Object metadata creation should fail v2 when namePlural is a reserved k
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -6454,6 +6472,7 @@ exports[`Object metadata creation should fail v2 when namePlural is not camelCas
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [
         {
           "errors": [
@@ -6745,6 +6764,7 @@ exports[`Object metadata creation should fail v2 when namePlural is not camelCas
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -7189,6 +7209,7 @@ exports[`Object metadata creation should fail v2 when nameSingular contains only
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [
         {
           "errors": [
@@ -7480,6 +7501,7 @@ exports[`Object metadata creation should fail v2 when nameSingular contains only
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -7912,6 +7934,7 @@ exports[`Object metadata creation should fail v2 when nameSingular contains only
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [
         {
           "errors": [
@@ -8203,6 +8226,7 @@ exports[`Object metadata creation should fail v2 when nameSingular contains only
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -8617,6 +8641,7 @@ exports[`Object metadata creation should fail v2 when nameSingular has invalid c
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [
         {
           "errors": [
@@ -8908,6 +8933,7 @@ exports[`Object metadata creation should fail v2 when nameSingular has invalid c
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -9310,6 +9336,7 @@ exports[`Object metadata creation should fail v2 when nameSingular is a reserved
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [
         {
           "errors": [
@@ -9601,6 +9628,7 @@ exports[`Object metadata creation should fail v2 when nameSingular is a reserved
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -10056,6 +10084,7 @@ exports[`Object metadata creation should fail v2 when nameSingular is not camelC
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [
         {
           "errors": [
@@ -10347,6 +10376,7 @@ exports[`Object metadata creation should fail v2 when nameSingular is not camelC
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -10725,6 +10755,7 @@ exports[`Object metadata creation should fail v2 when names are identical 1`] =
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [
         {
           "errors": [
@@ -11016,6 +11047,7 @@ exports[`Object metadata creation should fail v2 when names are identical 1`] =
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -11394,6 +11426,7 @@ exports[`Object metadata creation should fail v2 when names with whitespaces res
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [
         {
           "errors": [
@@ -11685,6 +11718,7 @@ exports[`Object metadata creation should fail v2 when names with whitespaces res
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/object-metadata/__snapshots__/failing-update-one-object-metadata.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/object-metadata/__snapshots__/failing-update-one-object-metadata.integration-spec.ts.snap
index b66c38112f8..7f3385452a6 100644
--- a/packages/twenty-server/test/integration/metadata/suites/object-metadata/__snapshots__/failing-update-one-object-metadata.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/object-metadata/__snapshots__/failing-update-one-object-metadata.integration-spec.ts.snap
@@ -38,6 +38,7 @@ exports[`Object metadata update should fail when labelIdentifier is a UUID field
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [
           {
@@ -78,6 +79,7 @@ exports[`Object metadata update should fail when labelIdentifier is a UUID field
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -131,6 +133,7 @@ exports[`Object metadata update should fail when labelIdentifier is not a TEXT o
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [
           {
@@ -171,6 +174,7 @@ exports[`Object metadata update should fail when labelIdentifier is not a TEXT o
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -224,6 +228,7 @@ exports[`Object metadata update should fail when labelIdentifier is not a known
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [
           {
@@ -269,6 +274,7 @@ exports[`Object metadata update should fail when labelIdentifier is not a known
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
@@ -339,6 +345,7 @@ exports[`Object metadata update should fail when labelIdentifier is null 1`] = `
         "rowLevelPermissionPredicate": [],
         "rowLevelPermissionPredicateGroup": [],
         "serverlessFunction": [],
+        "skill": [],
         "view": [],
         "viewField": [],
         "viewFilter": [],
@@ -362,6 +369,7 @@ exports[`Object metadata update should fail when labelIdentifier is null 1`] = `
         "invalidRowLevelPermissionPredicate": 0,
         "invalidRowLevelPermissionPredicateGroup": 0,
         "invalidServerlessFunction": 0,
+        "invalidSkill": 0,
         "invalidView": 0,
         "invalidViewField": 0,
         "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/__snapshots__/failing-page-layout-tab-creation.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/__snapshots__/failing-page-layout-tab-creation.integration-spec.ts.snap
index b0646155134..7dc67932119 100644
--- a/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/__snapshots__/failing-page-layout-tab-creation.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/__snapshots__/failing-page-layout-tab-creation.integration-spec.ts.snap
@@ -36,6 +36,7 @@ exports[`Page layout tab creation should fail when pageLayoutId references non-e
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -59,6 +60,7 @@ exports[`Page layout tab creation should fail when pageLayoutId references non-e
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/__snapshots__/failing-page-layout-widget-creation.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/__snapshots__/failing-page-layout-widget-creation.integration-spec.ts.snap
index 41beb7d5a1f..4c659427b42 100644
--- a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/__snapshots__/failing-page-layout-widget-creation.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/__snapshots__/failing-page-layout-widget-creation.integration-spec.ts.snap
@@ -47,6 +47,7 @@ exports[`Page layout widget creation should fail when pageLayoutTabId references
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -70,6 +71,7 @@ exports[`Page layout widget creation should fail when pageLayoutTabId references
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/role/__snapshots__/failing-role-creation.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/role/__snapshots__/failing-role-creation.integration-spec.ts.snap
index bf587fe33a1..4d6e241b585 100644
--- a/packages/twenty-server/test/integration/metadata/suites/role/__snapshots__/failing-role-creation.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/role/__snapshots__/failing-role-creation.integration-spec.ts.snap
@@ -36,6 +36,7 @@ exports[`Role creation should fail when canReadAllObjectRecords is false but can
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -59,6 +60,7 @@ exports[`Role creation should fail when canReadAllObjectRecords is false but can
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -109,6 +111,7 @@ exports[`Role creation should fail when canReadAllObjectRecords is false but can
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -132,6 +135,7 @@ exports[`Role creation should fail when canReadAllObjectRecords is false but can
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -182,6 +186,7 @@ exports[`Role creation should fail when canReadAllObjectRecords is false but can
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -205,6 +210,7 @@ exports[`Role creation should fail when canReadAllObjectRecords is false but can
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -255,6 +261,7 @@ exports[`Role creation should fail when canReadAllObjectRecords is false but mul
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -278,6 +285,7 @@ exports[`Role creation should fail when canReadAllObjectRecords is false but mul
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -328,6 +336,7 @@ exports[`Role creation should fail when label already exists 1`] = `
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -351,6 +360,7 @@ exports[`Role creation should fail when label already exists 1`] = `
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/role/__snapshots__/failing-role-update.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/role/__snapshots__/failing-role-update.integration-spec.ts.snap
index 7f2f1741434..1a122a1d735 100644
--- a/packages/twenty-server/test/integration/metadata/suites/role/__snapshots__/failing-role-update.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/role/__snapshots__/failing-role-update.integration-spec.ts.snap
@@ -47,6 +47,7 @@ exports[`Role update should fail updating role with existing write permissions s
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -70,6 +71,7 @@ exports[`Role update should fail updating role with existing write permissions s
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -119,6 +121,7 @@ exports[`Role update should fail when updating a non-editable system role 1`] =
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -142,6 +145,7 @@ exports[`Role update should fail when updating a non-editable system role 1`] =
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -191,6 +195,7 @@ exports[`Role update should fail when updating canReadAllObjectRecords to false
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -214,6 +219,7 @@ exports[`Role update should fail when updating canReadAllObjectRecords to false
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -263,6 +269,7 @@ exports[`Role update should fail when updating canReadAllObjectRecords to false
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -286,6 +293,7 @@ exports[`Role update should fail when updating canReadAllObjectRecords to false
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -335,6 +343,7 @@ exports[`Role update should fail when updating canReadAllObjectRecords to false
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -358,6 +367,7 @@ exports[`Role update should fail when updating canReadAllObjectRecords to false
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -407,6 +417,7 @@ exports[`Role update should fail when updating label to one that already exists
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -430,6 +441,7 @@ exports[`Role update should fail when updating label to one that already exists
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -479,6 +491,7 @@ exports[`Role update should fail when updating to enable write permissions witho
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -502,6 +515,7 @@ exports[`Role update should fail when updating to enable write permissions witho
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/__snapshots__/failing-skill-creation.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/skill/__snapshots__/failing-skill-creation.integration-spec.ts.snap
new file mode 100644
index 00000000000..832434b9dd6
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/__snapshots__/failing-skill-creation.integration-spec.ts.snap
@@ -0,0 +1,268 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Skill creation should fail when content is empty string 1`] = `
+{
+  "extensions": {
+    "code": "METADATA_VALIDATION_FAILED",
+    "errors": {
+      "agent": [],
+      "cronTrigger": [],
+      "databaseEventTrigger": [],
+      "fieldMetadata": [],
+      "index": [],
+      "objectMetadata": [],
+      "pageLayout": [],
+      "pageLayoutTab": [],
+      "pageLayoutWidget": [],
+      "role": [],
+      "roleTarget": [],
+      "routeTrigger": [],
+      "rowLevelPermissionPredicate": [],
+      "rowLevelPermissionPredicateGroup": [],
+      "serverlessFunction": [],
+      "skill": [
+        {
+          "errors": [
+            {
+              "code": "INVALID_SKILL_INPUT",
+              "message": "Content cannot be empty",
+              "userFriendlyMessage": "Content cannot be empty",
+            },
+          ],
+          "flatEntityMinimalInformation": {
+            "id": Any<String>,
+            "name": "emptyContentSkill",
+          },
+          "status": "fail",
+          "type": "create_skill",
+        },
+      ],
+      "view": [],
+      "viewField": [],
+      "viewFilter": [],
+      "viewFilterGroup": [],
+      "viewGroup": [],
+    },
+    "message": "Validation failed for 0 object(s) and 0 field(s)",
+    "summary": {
+      "invalidAgent": 0,
+      "invalidCronTrigger": 0,
+      "invalidDatabaseEventTrigger": 0,
+      "invalidFieldMetadata": 0,
+      "invalidIndex": 0,
+      "invalidObjectMetadata": 0,
+      "invalidPageLayout": 0,
+      "invalidPageLayoutTab": 0,
+      "invalidPageLayoutWidget": 0,
+      "invalidRole": 0,
+      "invalidRoleTarget": 0,
+      "invalidRouteTrigger": 0,
+      "invalidRowLevelPermissionPredicate": 0,
+      "invalidRowLevelPermissionPredicateGroup": 0,
+      "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
+      "invalidView": 0,
+      "invalidViewField": 0,
+      "invalidViewFilter": 0,
+      "invalidViewFilterGroup": 0,
+      "invalidViewGroup": 0,
+      "totalErrors": 0,
+    },
+    "userFriendlyMessage": "Validation failed for 0 object(s) and 0 field(s)",
+  },
+  "message": "Multiple validation errors occurred while creating skill",
+  "name": "GraphQLError",
+}
+`;
+
+exports[`Skill creation should fail when content is missing 1`] = `
+{
+  "extensions": {
+    "code": "BAD_USER_INPUT",
+    "http": {
+      "status": 400,
+    },
+    "userFriendlyMessage": "An error occurred.",
+  },
+  "message": "Field "content" of required type "String!" was not provided.",
+  "name": "GraphQLError",
+}
+`;
+
+exports[`Skill creation should fail when label is empty string 1`] = `
+{
+  "extensions": {
+    "code": "METADATA_VALIDATION_FAILED",
+    "errors": {
+      "agent": [],
+      "cronTrigger": [],
+      "databaseEventTrigger": [],
+      "fieldMetadata": [],
+      "index": [],
+      "objectMetadata": [],
+      "pageLayout": [],
+      "pageLayoutTab": [],
+      "pageLayoutWidget": [],
+      "role": [],
+      "roleTarget": [],
+      "routeTrigger": [],
+      "rowLevelPermissionPredicate": [],
+      "rowLevelPermissionPredicateGroup": [],
+      "serverlessFunction": [],
+      "skill": [
+        {
+          "errors": [
+            {
+              "code": "INVALID_SKILL_INPUT",
+              "message": "Label cannot be empty",
+              "userFriendlyMessage": "Label cannot be empty",
+            },
+          ],
+          "flatEntityMinimalInformation": {
+            "id": Any<String>,
+            "name": "emptyLabelSkill",
+          },
+          "status": "fail",
+          "type": "create_skill",
+        },
+      ],
+      "view": [],
+      "viewField": [],
+      "viewFilter": [],
+      "viewFilterGroup": [],
+      "viewGroup": [],
+    },
+    "message": "Validation failed for 0 object(s) and 0 field(s)",
+    "summary": {
+      "invalidAgent": 0,
+      "invalidCronTrigger": 0,
+      "invalidDatabaseEventTrigger": 0,
+      "invalidFieldMetadata": 0,
+      "invalidIndex": 0,
+      "invalidObjectMetadata": 0,
+      "invalidPageLayout": 0,
+      "invalidPageLayoutTab": 0,
+      "invalidPageLayoutWidget": 0,
+      "invalidRole": 0,
+      "invalidRoleTarget": 0,
+      "invalidRouteTrigger": 0,
+      "invalidRowLevelPermissionPredicate": 0,
+      "invalidRowLevelPermissionPredicateGroup": 0,
+      "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
+      "invalidView": 0,
+      "invalidViewField": 0,
+      "invalidViewFilter": 0,
+      "invalidViewFilterGroup": 0,
+      "invalidViewGroup": 0,
+      "totalErrors": 0,
+    },
+    "userFriendlyMessage": "Validation failed for 0 object(s) and 0 field(s)",
+  },
+  "message": "Multiple validation errors occurred while creating skill",
+  "name": "GraphQLError",
+}
+`;
+
+exports[`Skill creation should fail when label is missing 1`] = `
+{
+  "extensions": {
+    "code": "BAD_USER_INPUT",
+    "http": {
+      "status": 400,
+    },
+    "userFriendlyMessage": "An error occurred.",
+  },
+  "message": "Field "label" of required type "String!" was not provided.",
+  "name": "GraphQLError",
+}
+`;
+
+exports[`Skill creation should fail when name already exists 1`] = `
+{
+  "extensions": {
+    "code": "METADATA_VALIDATION_FAILED",
+    "errors": {
+      "agent": [],
+      "cronTrigger": [],
+      "databaseEventTrigger": [],
+      "fieldMetadata": [],
+      "index": [],
+      "objectMetadata": [],
+      "pageLayout": [],
+      "pageLayoutTab": [],
+      "pageLayoutWidget": [],
+      "role": [],
+      "roleTarget": [],
+      "routeTrigger": [],
+      "rowLevelPermissionPredicate": [],
+      "rowLevelPermissionPredicateGroup": [],
+      "serverlessFunction": [],
+      "skill": [
+        {
+          "errors": [
+            {
+              "code": "SKILL_ALREADY_EXISTS",
+              "message": "Skill with name "existingTestSkill" already exists",
+              "userFriendlyMessage": "A skill with this name already exists",
+            },
+          ],
+          "flatEntityMinimalInformation": {
+            "id": Any<String>,
+            "name": "existingTestSkill",
+          },
+          "status": "fail",
+          "type": "create_skill",
+        },
+      ],
+      "view": [],
+      "viewField": [],
+      "viewFilter": [],
+      "viewFilterGroup": [],
+      "viewGroup": [],
+    },
+    "message": "Validation failed for 0 object(s) and 0 field(s)",
+    "summary": {
+      "invalidAgent": 0,
+      "invalidCronTrigger": 0,
+      "invalidDatabaseEventTrigger": 0,
+      "invalidFieldMetadata": 0,
+      "invalidIndex": 0,
+      "invalidObjectMetadata": 0,
+      "invalidPageLayout": 0,
+      "invalidPageLayoutTab": 0,
+      "invalidPageLayoutWidget": 0,
+      "invalidRole": 0,
+      "invalidRoleTarget": 0,
+      "invalidRouteTrigger": 0,
+      "invalidRowLevelPermissionPredicate": 0,
+      "invalidRowLevelPermissionPredicateGroup": 0,
+      "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
+      "invalidView": 0,
+      "invalidViewField": 0,
+      "invalidViewFilter": 0,
+      "invalidViewFilterGroup": 0,
+      "invalidViewGroup": 0,
+      "totalErrors": 0,
+    },
+    "userFriendlyMessage": "Validation failed for 0 object(s) and 0 field(s)",
+  },
+  "message": "Multiple validation errors occurred while creating skill",
+  "name": "GraphQLError",
+}
+`;
+
+exports[`Skill creation should fail when name is missing 1`] = `
+{
+  "extensions": {
+    "code": "BAD_USER_INPUT",
+    "http": {
+      "status": 400,
+    },
+    "userFriendlyMessage": "An error occurred.",
+  },
+  "message": "Field "name" of required type "String!" was not provided.",
+  "name": "GraphQLError",
+}
+`;
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/__snapshots__/failing-skill-deletion.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/skill/__snapshots__/failing-skill-deletion.integration-spec.ts.snap
new file mode 100644
index 00000000000..8cdebef5f8e
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/__snapshots__/failing-skill-deletion.integration-spec.ts.snap
@@ -0,0 +1,25 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Skill deletion should fail should fail when attempting to delete a standard skill 1`] = `
+{
+  "extensions": {
+    "code": "FORBIDDEN",
+    "subCode": "SKILL_IS_STANDARD",
+    "userFriendlyMessage": "Standard skills cannot be modified.",
+  },
+  "message": "Cannot delete standard skill",
+  "name": "ForbiddenError",
+}
+`;
+
+exports[`Skill deletion should fail when deleting a non-existent skill 1`] = `
+{
+  "extensions": {
+    "code": "NOT_FOUND",
+    "subCode": "SKILL_NOT_FOUND",
+    "userFriendlyMessage": "Skill not found.",
+  },
+  "message": "Skill not found",
+  "name": "NotFoundError",
+}
+`;
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/__snapshots__/failing-skill-update.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/skill/__snapshots__/failing-skill-update.integration-spec.ts.snap
new file mode 100644
index 00000000000..18a46de0415
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/__snapshots__/failing-skill-update.integration-spec.ts.snap
@@ -0,0 +1,173 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Skill update should fail should fail when attempting to update a standard skill 1`] = `
+{
+  "extensions": {
+    "code": "FORBIDDEN",
+    "subCode": "SKILL_IS_STANDARD",
+    "userFriendlyMessage": "Standard skills cannot be modified.",
+  },
+  "message": "Cannot update standard skill",
+  "name": "ForbiddenError",
+}
+`;
+
+exports[`Skill update should fail should fail when updating a non-existent skill 1`] = `
+{
+  "extensions": {
+    "code": "NOT_FOUND",
+    "subCode": "SKILL_NOT_FOUND",
+    "userFriendlyMessage": "Skill not found.",
+  },
+  "message": "Skill not found",
+  "name": "NotFoundError",
+}
+`;
+
+exports[`Skill update should fail when updating with empty content 1`] = `
+{
+  "extensions": {
+    "code": "METADATA_VALIDATION_FAILED",
+    "errors": {
+      "agent": [],
+      "cronTrigger": [],
+      "databaseEventTrigger": [],
+      "fieldMetadata": [],
+      "index": [],
+      "objectMetadata": [],
+      "pageLayout": [],
+      "pageLayoutTab": [],
+      "pageLayoutWidget": [],
+      "role": [],
+      "roleTarget": [],
+      "routeTrigger": [],
+      "rowLevelPermissionPredicate": [],
+      "rowLevelPermissionPredicateGroup": [],
+      "serverlessFunction": [],
+      "skill": [
+        {
+          "errors": [
+            {
+              "code": "INVALID_SKILL_INPUT",
+              "message": "Content cannot be empty",
+              "userFriendlyMessage": "Content cannot be empty",
+            },
+          ],
+          "flatEntityMinimalInformation": {
+            "id": Any<String>,
+          },
+          "status": "fail",
+          "type": "update_skill",
+        },
+      ],
+      "view": [],
+      "viewField": [],
+      "viewFilter": [],
+      "viewFilterGroup": [],
+      "viewGroup": [],
+    },
+    "message": "Validation failed for 0 object(s) and 0 field(s)",
+    "summary": {
+      "invalidAgent": 0,
+      "invalidCronTrigger": 0,
+      "invalidDatabaseEventTrigger": 0,
+      "invalidFieldMetadata": 0,
+      "invalidIndex": 0,
+      "invalidObjectMetadata": 0,
+      "invalidPageLayout": 0,
+      "invalidPageLayoutTab": 0,
+      "invalidPageLayoutWidget": 0,
+      "invalidRole": 0,
+      "invalidRoleTarget": 0,
+      "invalidRouteTrigger": 0,
+      "invalidRowLevelPermissionPredicate": 0,
+      "invalidRowLevelPermissionPredicateGroup": 0,
+      "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
+      "invalidView": 0,
+      "invalidViewField": 0,
+      "invalidViewFilter": 0,
+      "invalidViewFilterGroup": 0,
+      "invalidViewGroup": 0,
+      "totalErrors": 0,
+    },
+    "userFriendlyMessage": "Validation failed for 0 object(s) and 0 field(s)",
+  },
+  "message": "Multiple validation errors occurred while updating skill",
+  "name": "GraphQLError",
+}
+`;
+
+exports[`Skill update should fail when updating with empty label 1`] = `
+{
+  "extensions": {
+    "code": "METADATA_VALIDATION_FAILED",
+    "errors": {
+      "agent": [],
+      "cronTrigger": [],
+      "databaseEventTrigger": [],
+      "fieldMetadata": [],
+      "index": [],
+      "objectMetadata": [],
+      "pageLayout": [],
+      "pageLayoutTab": [],
+      "pageLayoutWidget": [],
+      "role": [],
+      "roleTarget": [],
+      "routeTrigger": [],
+      "rowLevelPermissionPredicate": [],
+      "rowLevelPermissionPredicateGroup": [],
+      "serverlessFunction": [],
+      "skill": [
+        {
+          "errors": [
+            {
+              "code": "INVALID_SKILL_INPUT",
+              "message": "Label cannot be empty",
+              "userFriendlyMessage": "Label cannot be empty",
+            },
+          ],
+          "flatEntityMinimalInformation": {
+            "id": Any<String>,
+          },
+          "status": "fail",
+          "type": "update_skill",
+        },
+      ],
+      "view": [],
+      "viewField": [],
+      "viewFilter": [],
+      "viewFilterGroup": [],
+      "viewGroup": [],
+    },
+    "message": "Validation failed for 0 object(s) and 0 field(s)",
+    "summary": {
+      "invalidAgent": 0,
+      "invalidCronTrigger": 0,
+      "invalidDatabaseEventTrigger": 0,
+      "invalidFieldMetadata": 0,
+      "invalidIndex": 0,
+      "invalidObjectMetadata": 0,
+      "invalidPageLayout": 0,
+      "invalidPageLayoutTab": 0,
+      "invalidPageLayoutWidget": 0,
+      "invalidRole": 0,
+      "invalidRoleTarget": 0,
+      "invalidRouteTrigger": 0,
+      "invalidRowLevelPermissionPredicate": 0,
+      "invalidRowLevelPermissionPredicateGroup": 0,
+      "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
+      "invalidView": 0,
+      "invalidViewField": 0,
+      "invalidViewFilter": 0,
+      "invalidViewFilterGroup": 0,
+      "invalidViewGroup": 0,
+      "totalErrors": 0,
+    },
+    "userFriendlyMessage": "Validation failed for 0 object(s) and 0 field(s)",
+  },
+  "message": "Multiple validation errors occurred while updating skill",
+  "name": "GraphQLError",
+}
+`;
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/failing-skill-creation.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/skill/failing-skill-creation.integration-spec.ts
new file mode 100644
index 00000000000..59bcf939726
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/failing-skill-creation.integration-spec.ts
@@ -0,0 +1,128 @@
+import { expectOneNotInternalServerErrorSnapshot } from 'test/integration/graphql/utils/expect-one-not-internal-server-error-snapshot.util';
+import { createSkill } from 'test/integration/metadata/suites/skill/utils/create-skill.util';
+import { deleteSkill } from 'test/integration/metadata/suites/skill/utils/delete-skill.util';
+import {
+  eachTestingContextFilter,
+  type EachTestingContext,
+} from 'twenty-shared/testing';
+import { isDefined } from 'twenty-shared/utils';
+
+import { type CreateSkillInput } from 'src/engine/metadata-modules/skill/dtos/create-skill.input';
+
+type TestContext = {
+  input: CreateSkillInput;
+};
+
+type GlobalTestContext = {
+  existingSkillLabel: string;
+  existingSkillName: string;
+};
+
+const globalTestContext: GlobalTestContext = {
+  existingSkillLabel: 'Existing Test Skill',
+  existingSkillName: 'existingTestSkill',
+};
+
+type CreateSkillTestingContext = EachTestingContext<TestContext>[];
+
+describe('Skill creation should fail', () => {
+  let existingSkillId: string | undefined;
+
+  beforeAll(async () => {
+    const { data } = await createSkill({
+      expectToFail: false,
+      input: {
+        name: globalTestContext.existingSkillName,
+        label: globalTestContext.existingSkillLabel,
+        content: 'Existing skill for testing',
+      },
+    });
+
+    existingSkillId = data.createSkill.id;
+  });
+
+  afterAll(async () => {
+    if (isDefined(existingSkillId)) {
+      await deleteSkill({
+        expectToFail: false,
+        input: { id: existingSkillId },
+      });
+    }
+  });
+
+  const failingSkillCreationTestCases: CreateSkillTestingContext = [
+    // Missing required properties tests
+    {
+      title: 'when label is missing',
+      context: {
+        input: {
+          name: 'skillMissingLabel',
+          content: 'Test content',
+        } as CreateSkillInput,
+      },
+    },
+    {
+      title: 'when content is missing',
+      context: {
+        input: {
+          name: 'skillMissingContent',
+          label: 'Skill Missing Content',
+        } as CreateSkillInput,
+      },
+    },
+    {
+      title: 'when name is missing',
+      context: {
+        input: {
+          label: 'Skill Missing Name',
+          content: 'Test content',
+        } as CreateSkillInput,
+      },
+    },
+    {
+      title: 'when label is empty string',
+      context: {
+        input: {
+          name: 'emptyLabelSkill',
+          label: '',
+          content: 'Test content',
+        },
+      },
+    },
+    {
+      title: 'when content is empty string',
+      context: {
+        input: {
+          name: 'emptyContentSkill',
+          label: 'Empty Content Skill',
+          content: '',
+        },
+      },
+    },
+    // Name uniqueness test
+    {
+      title: 'when name already exists',
+      context: {
+        input: {
+          name: globalTestContext.existingSkillName,
+          label: 'Duplicate Name Skill',
+          content: 'Duplicate skill content',
+        },
+      },
+    },
+  ];
+
+  it.each(eachTestingContextFilter(failingSkillCreationTestCases))(
+    '$title',
+    async ({ context }) => {
+      const { errors } = await createSkill({
+        expectToFail: true,
+        input: context.input,
+      });
+
+      expectOneNotInternalServerErrorSnapshot({
+        errors,
+      });
+    },
+  );
+});
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/failing-skill-deletion.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/skill/failing-skill-deletion.integration-spec.ts
new file mode 100644
index 00000000000..fd3b273a8c6
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/failing-skill-deletion.integration-spec.ts
@@ -0,0 +1,69 @@
+import { faker } from '@faker-js/faker';
+import { expectOneNotInternalServerErrorSnapshot } from 'test/integration/graphql/utils/expect-one-not-internal-server-error-snapshot.util';
+import { deleteSkill } from 'test/integration/metadata/suites/skill/utils/delete-skill.util';
+import { findSkills } from 'test/integration/metadata/suites/skill/utils/find-skills.util';
+import {
+  eachTestingContextFilter,
+  type EachTestingContext,
+} from 'twenty-shared/testing';
+
+type TestContext = {
+  input: () => {
+    id: string;
+  };
+};
+
+type DeleteSkillTestingContext = EachTestingContext<TestContext>[];
+
+describe('Skill deletion should fail', () => {
+  const failingSkillDeletionTestCases: DeleteSkillTestingContext = [
+    {
+      title: 'when deleting a non-existent skill',
+      context: {
+        input: () => ({
+          id: faker.string.uuid(),
+        }),
+      },
+    },
+  ];
+
+  it.each(eachTestingContextFilter(failingSkillDeletionTestCases))(
+    '$title',
+    async ({ context }) => {
+      const { id } = context.input();
+
+      const { errors } = await deleteSkill({
+        expectToFail: true,
+        input: {
+          id,
+        },
+      });
+
+      expectOneNotInternalServerErrorSnapshot({ errors });
+    },
+  );
+
+  it('should fail when attempting to delete a standard skill', async () => {
+    const { data } = await findSkills({
+      expectToFail: false,
+      input: undefined,
+      gqlFields: 'id name isCustom',
+    });
+
+    const standardSkill = data.skills.find((skill) => skill.isCustom === false);
+
+    // If there are no standard skills, skip this test
+    if (!standardSkill) {
+      return;
+    }
+
+    const { errors } = await deleteSkill({
+      expectToFail: true,
+      input: {
+        id: standardSkill.id,
+      },
+    });
+
+    expectOneNotInternalServerErrorSnapshot({ errors });
+  });
+});
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/failing-skill-update.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/skill/failing-skill-update.integration-spec.ts
new file mode 100644
index 00000000000..3d0ed51cfdc
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/failing-skill-update.integration-spec.ts
@@ -0,0 +1,164 @@
+import { faker } from '@faker-js/faker';
+import { expectOneNotInternalServerErrorSnapshot } from 'test/integration/graphql/utils/expect-one-not-internal-server-error-snapshot.util';
+import { createSkill } from 'test/integration/metadata/suites/skill/utils/create-skill.util';
+import { deleteSkill } from 'test/integration/metadata/suites/skill/utils/delete-skill.util';
+import { findSkills } from 'test/integration/metadata/suites/skill/utils/find-skills.util';
+import { updateSkill } from 'test/integration/metadata/suites/skill/utils/update-skill.util';
+import {
+  eachTestingContextFilter,
+  type EachTestingContext,
+} from 'twenty-shared/testing';
+
+import { type UpdateSkillInput } from 'src/engine/metadata-modules/skill/dtos/update-skill.input';
+
+type TestContext = {
+  input: (testSetup: TestSetup) => UpdateSkillInput;
+};
+
+type TestSetup = {
+  testSkillId: string;
+  existingSkillNameForDuplicate: string;
+};
+
+type GlobalTestContext = {
+  existingSkillNameForDuplicate: string;
+};
+
+const globalTestContext: GlobalTestContext = {
+  existingSkillNameForDuplicate: 'existingSkillForDuplicateTest',
+};
+
+type UpdateSkillTestingContext = EachTestingContext<TestContext>[];
+
+describe('Skill update should fail', () => {
+  let testSkillId: string;
+  let existingSkillIdForDuplicate: string;
+
+  beforeAll(async () => {
+    const { data: duplicateData } = await createSkill({
+      expectToFail: false,
+      input: {
+        name: globalTestContext.existingSkillNameForDuplicate,
+        label: 'Existing Skill For Duplicate Test',
+        content: 'Existing skill for duplicate test',
+      },
+    });
+
+    existingSkillIdForDuplicate = duplicateData.createSkill.id;
+  });
+
+  beforeEach(async () => {
+    const { data } = await createSkill({
+      expectToFail: false,
+      input: {
+        name: 'testSkillToUpdate',
+        label: 'Test Skill To Update',
+        description: 'Original description',
+        icon: 'IconSparkles',
+        content: 'Original content',
+      },
+    });
+
+    testSkillId = data.createSkill.id;
+  });
+
+  afterEach(async () => {
+    await deleteSkill({
+      expectToFail: false,
+      input: { id: testSkillId },
+    });
+  });
+
+  afterAll(async () => {
+    await deleteSkill({
+      expectToFail: false,
+      input: { id: existingSkillIdForDuplicate },
+    });
+  });
+
+  const failingSkillUpdateTestCases: UpdateSkillTestingContext = [
+    {
+      title: 'when updating with empty label',
+      context: {
+        input: (testSetup) => ({
+          id: testSetup.testSkillId,
+          label: '',
+        }),
+      },
+    },
+    {
+      title: 'when updating with empty content',
+      context: {
+        input: (testSetup) => ({
+          id: testSetup.testSkillId,
+          content: '',
+        }),
+      },
+    },
+  ];
+
+  it.each(eachTestingContextFilter(failingSkillUpdateTestCases))(
+    '$title',
+    async ({ context }) => {
+      const testSetup: TestSetup = {
+        testSkillId,
+        existingSkillNameForDuplicate:
+          globalTestContext.existingSkillNameForDuplicate,
+      };
+
+      const input = context.input(testSetup);
+
+      const { errors } = await updateSkill({
+        expectToFail: true,
+        input,
+      });
+
+      expectOneNotInternalServerErrorSnapshot({
+        errors,
+      });
+    },
+  );
+
+  it('should fail when updating a non-existent skill', async () => {
+    const nonExistentSkillId = faker.string.uuid();
+
+    const { errors } = await updateSkill({
+      expectToFail: true,
+      input: {
+        id: nonExistentSkillId,
+        label: 'Updated Label',
+      },
+    });
+
+    expectOneNotInternalServerErrorSnapshot({
+      errors,
+    });
+  });
+
+  it('should fail when attempting to update a standard skill', async () => {
+    const { data } = await findSkills({
+      expectToFail: false,
+      input: undefined,
+      gqlFields: 'id name isCustom',
+    });
+
+    const standardSkill = data.skills.find((skill) => skill.isCustom === false);
+
+    // If there are no standard skills, skip this test
+    if (!standardSkill) {
+      return;
+    }
+
+    const { errors } = await updateSkill({
+      expectToFail: true,
+      input: {
+        id: standardSkill.id,
+        label: 'Attempted Update to Standard Skill',
+      },
+    });
+
+    expectOneNotInternalServerErrorSnapshot({
+      errors,
+    });
+  });
+});
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/successful-skill-activation.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/skill/successful-skill-activation.integration-spec.ts
new file mode 100644
index 00000000000..a197dca404e
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/successful-skill-activation.integration-spec.ts
@@ -0,0 +1,113 @@
+import { activateSkill } from 'test/integration/metadata/suites/skill/utils/activate-skill.util';
+import { createSkill } from 'test/integration/metadata/suites/skill/utils/create-skill.util';
+import { deactivateSkill } from 'test/integration/metadata/suites/skill/utils/deactivate-skill.util';
+import { deleteSkill } from 'test/integration/metadata/suites/skill/utils/delete-skill.util';
+
+describe('Skill activation should succeed', () => {
+  let testSkillId: string;
+
+  beforeEach(async () => {
+    const { data } = await createSkill({
+      expectToFail: false,
+      input: {
+        name: 'testSkillForActivation',
+        label: 'Test Skill For Activation',
+        content: 'Test content',
+      },
+    });
+
+    testSkillId = data.createSkill.id;
+  });
+
+  afterEach(async () => {
+    await deleteSkill({
+      expectToFail: false,
+      input: { id: testSkillId },
+    });
+  });
+
+  it('should create a skill with isActive true by default', async () => {
+    const { data } = await createSkill({
+      expectToFail: false,
+      input: {
+        name: 'activeByDefaultSkill',
+        label: 'Active By Default Skill',
+        content: 'Test content',
+      },
+    });
+
+    const skillId = data.createSkill.id;
+
+    expect(data.createSkill).toMatchObject({
+      id: skillId,
+      isActive: true,
+      isCustom: true,
+    });
+
+    await deleteSkill({
+      expectToFail: false,
+      input: { id: skillId },
+    });
+  });
+
+  it('should deactivate a skill', async () => {
+    const { data } = await deactivateSkill({
+      expectToFail: false,
+      input: { id: testSkillId },
+    });
+
+    expect(data.deactivateSkill).toMatchObject({
+      id: testSkillId,
+      isActive: false,
+    });
+  });
+
+  it('should activate a deactivated skill', async () => {
+    await deactivateSkill({
+      expectToFail: false,
+      input: { id: testSkillId },
+    });
+
+    const { data } = await activateSkill({
+      expectToFail: false,
+      input: { id: testSkillId },
+    });
+
+    expect(data.activateSkill).toMatchObject({
+      id: testSkillId,
+      isActive: true,
+    });
+  });
+
+  it('should allow deactivating an already active skill (no-op)', async () => {
+    const { data: firstDeactivate } = await deactivateSkill({
+      expectToFail: false,
+      input: { id: testSkillId },
+    });
+
+    expect(firstDeactivate.deactivateSkill.isActive).toBe(false);
+
+    const { data: secondDeactivate } = await deactivateSkill({
+      expectToFail: false,
+      input: { id: testSkillId },
+    });
+
+    expect(secondDeactivate.deactivateSkill.isActive).toBe(false);
+  });
+
+  it('should allow activating an already active skill (no-op)', async () => {
+    const { data: firstActivate } = await activateSkill({
+      expectToFail: false,
+      input: { id: testSkillId },
+    });
+
+    expect(firstActivate.activateSkill.isActive).toBe(true);
+
+    const { data: secondActivate } = await activateSkill({
+      expectToFail: false,
+      input: { id: testSkillId },
+    });
+
+    expect(secondActivate.activateSkill.isActive).toBe(true);
+  });
+});
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/successful-skill-creation.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/skill/successful-skill-creation.integration-spec.ts
new file mode 100644
index 00000000000..7690cd02cd6
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/successful-skill-creation.integration-spec.ts
@@ -0,0 +1,147 @@
+import { createSkill } from 'test/integration/metadata/suites/skill/utils/create-skill.util';
+import { deleteSkill } from 'test/integration/metadata/suites/skill/utils/delete-skill.util';
+
+import { type CreateSkillInput } from 'src/engine/metadata-modules/skill/dtos/create-skill.input';
+
+describe('Skill creation should succeed', () => {
+  let createdSkillId: string;
+
+  afterEach(async () => {
+    if (createdSkillId) {
+      await deleteSkill({
+        expectToFail: false,
+        input: { id: createdSkillId },
+      });
+    }
+  });
+
+  it('should create a basic custom skill with minimal input', async () => {
+    const { data } = await createSkill({
+      expectToFail: false,
+      input: {
+        name: 'testSkill',
+        label: 'Test Skill',
+        content: 'This is the skill content with instructions',
+      },
+    });
+
+    createdSkillId = data?.createSkill?.id;
+
+    expect(data.createSkill).toMatchObject({
+      id: expect.any(String),
+      name: 'testSkill',
+      label: 'Test Skill',
+      icon: null,
+      description: null,
+      content: 'This is the skill content with instructions',
+      isCustom: true,
+      isActive: true,
+    });
+  });
+
+  it('should create skill with all optional fields', async () => {
+    const input = {
+      name: 'customSkillName',
+      label: 'Custom Skill Label',
+      icon: 'IconSparkles',
+      description: 'A custom skill with all fields specified',
+      content: 'Detailed instructions for the skill',
+    } as const satisfies CreateSkillInput;
+
+    const { data } = await createSkill({
+      expectToFail: false,
+      input,
+    });
+
+    createdSkillId = data?.createSkill?.id;
+
+    expect(data.createSkill).toMatchObject({
+      id: expect.any(String),
+      ...input,
+      isCustom: true,
+      isActive: true,
+    });
+  });
+
+  it('should sanitize input by trimming whitespace', async () => {
+    const { data } = await createSkill({
+      expectToFail: false,
+      input: {
+        name: '  skillWithSpaces  ',
+        label: '  Skill With Spaces  ',
+        icon: '  IconSparkles  ',
+        description: '  Description with spaces  ',
+        content: '  Content with spaces  ',
+      },
+    });
+
+    createdSkillId = data?.createSkill?.id;
+
+    expect(data.createSkill).toMatchObject({
+      id: expect.any(String),
+      name: 'skillWithSpaces',
+      label: 'Skill With Spaces',
+      icon: 'IconSparkles',
+      description: 'Description with spaces',
+      content: 'Content with spaces',
+    });
+  });
+
+  it('should create skill with long content', async () => {
+    const longContent =
+      'This is a long content that describes the skill instructions in detail.';
+
+    const { data } = await createSkill({
+      expectToFail: false,
+      input: {
+        name: 'longContentSkill',
+        label: 'Long Content Skill',
+        content: longContent,
+      },
+    });
+
+    createdSkillId = data?.createSkill?.id;
+
+    expect(data.createSkill).toMatchObject({
+      id: expect.any(String),
+      name: 'longContentSkill',
+      label: 'Long Content Skill',
+      content: longContent,
+      isCustom: true,
+      isActive: true,
+    });
+  });
+
+  it('should preserve markdown formatting with newlines in content', async () => {
+    const markdownContent = `# Skill Instructions
+
+## Step 1
+Do the first thing.
+
+## Step 2
+Do the second thing.
+
+- List item 1
+- List item 2`;
+
+    const { data } = await createSkill({
+      expectToFail: false,
+      input: {
+        name: 'markdownSkill',
+        label: 'Markdown Skill',
+        content: markdownContent,
+      },
+    });
+
+    createdSkillId = data?.createSkill?.id;
+
+    expect(data.createSkill).toMatchObject({
+      id: expect.any(String),
+      name: 'markdownSkill',
+      label: 'Markdown Skill',
+      content: markdownContent,
+      isCustom: true,
+      isActive: true,
+    });
+  });
+});
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/successful-skill-deletion.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/skill/successful-skill-deletion.integration-spec.ts
new file mode 100644
index 00000000000..641d882ccb1
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/successful-skill-deletion.integration-spec.ts
@@ -0,0 +1,44 @@
+import { createSkill } from 'test/integration/metadata/suites/skill/utils/create-skill.util';
+import { deleteSkill } from 'test/integration/metadata/suites/skill/utils/delete-skill.util';
+import { findSkill } from 'test/integration/metadata/suites/skill/utils/find-skill.util';
+
+describe('Skill deletion should succeed', () => {
+  it('should successfully delete a custom skill', async () => {
+    const { data: createData } = await createSkill({
+      expectToFail: false,
+      input: {
+        name: 'skillToDelete',
+        label: 'Skill To Delete',
+        content: 'This skill will be deleted',
+      },
+    });
+
+    const skillId = createData.createSkill.id;
+
+    const { data: findBeforeData } = await findSkill({
+      expectToFail: false,
+      input: { id: skillId },
+    });
+
+    expect(findBeforeData.skill.id).toBe(skillId);
+
+    const { data: deleteData } = await deleteSkill({
+      expectToFail: false,
+      input: { id: skillId },
+    });
+
+    expect(deleteData.deleteSkill).toMatchObject({
+      id: skillId,
+      name: 'skillToDelete',
+      label: 'Skill To Delete',
+    });
+
+    // After deletion, the skill query returns null instead of throwing an error
+    const { data: findAfterData } = await findSkill({
+      expectToFail: false,
+      input: { id: skillId },
+    });
+
+    expect(findAfterData.skill).toBeNull();
+  });
+});
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/successful-skill-update.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/skill/successful-skill-update.integration-spec.ts
new file mode 100644
index 00000000000..5a9ab123f5a
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/successful-skill-update.integration-spec.ts
@@ -0,0 +1,131 @@
+import { createSkill } from 'test/integration/metadata/suites/skill/utils/create-skill.util';
+import { deleteSkill } from 'test/integration/metadata/suites/skill/utils/delete-skill.util';
+import { updateSkill } from 'test/integration/metadata/suites/skill/utils/update-skill.util';
+
+describe('Skill update should succeed', () => {
+  let testSkillId: string;
+
+  beforeEach(async () => {
+    const { data } = await createSkill({
+      expectToFail: false,
+      input: {
+        name: 'testSkillToUpdate',
+        label: 'Test Skill To Update',
+        description: 'Original description',
+        icon: 'IconSparkles',
+        content: 'Original content',
+      },
+    });
+
+    testSkillId = data.createSkill.id;
+  });
+
+  afterEach(async () => {
+    await deleteSkill({
+      expectToFail: false,
+      input: { id: testSkillId },
+    });
+  });
+
+  it('should update skill label', async () => {
+    const { data } = await updateSkill({
+      expectToFail: false,
+      input: {
+        id: testSkillId,
+        label: 'Updated Skill Label',
+      },
+    });
+
+    expect(data.updateSkill).toMatchObject({
+      id: testSkillId,
+      label: 'Updated Skill Label',
+      description: 'Original description',
+      icon: 'IconSparkles',
+      content: 'Original content',
+    });
+  });
+
+  it('should update skill description', async () => {
+    const { data } = await updateSkill({
+      expectToFail: false,
+      input: {
+        id: testSkillId,
+        description: 'Updated description',
+      },
+    });
+
+    expect(data.updateSkill).toMatchObject({
+      id: testSkillId,
+      label: 'Test Skill To Update',
+      description: 'Updated description',
+    });
+  });
+
+  it('should update skill icon', async () => {
+    const { data } = await updateSkill({
+      expectToFail: false,
+      input: {
+        id: testSkillId,
+        icon: 'IconRobot',
+      },
+    });
+
+    expect(data.updateSkill).toMatchObject({
+      id: testSkillId,
+      icon: 'IconRobot',
+    });
+  });
+
+  it('should update skill content', async () => {
+    const newContent = 'Updated content with new instructions';
+
+    const { data } = await updateSkill({
+      expectToFail: false,
+      input: {
+        id: testSkillId,
+        content: newContent,
+      },
+    });
+
+    expect(data.updateSkill).toMatchObject({
+      id: testSkillId,
+      content: newContent,
+    });
+  });
+
+  it('should update multiple fields at once', async () => {
+    const { data } = await updateSkill({
+      expectToFail: false,
+      input: {
+        id: testSkillId,
+        label: 'Completely Updated Skill',
+        description: 'Completely updated description',
+        icon: 'IconBrain',
+        content: 'Completely updated content',
+      },
+    });
+
+    expect(data.updateSkill).toMatchObject({
+      id: testSkillId,
+      label: 'Completely Updated Skill',
+      description: 'Completely updated description',
+      icon: 'IconBrain',
+      content: 'Completely updated content',
+    });
+  });
+
+  it('should update label to a unique value', async () => {
+    const { data } = await updateSkill({
+      expectToFail: false,
+      input: {
+        id: testSkillId,
+        label: 'Unique Updated Label',
+      },
+    });
+
+    expect(data.updateSkill).toMatchObject({
+      id: testSkillId,
+      label: 'Unique Updated Label',
+    });
+  });
+});
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/utils/activate-skill-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/skill/utils/activate-skill-query-factory.util.ts
new file mode 100644
index 00000000000..97993102aff
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/utils/activate-skill-query-factory.util.ts
@@ -0,0 +1,36 @@
+import gql from 'graphql-tag';
+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';
+
+export type ActivateSkillFactoryInput = {
+  id: string;
+};
+
+const DEFAULT_SKILL_GQL_FIELDS = `
+  id
+  name
+  label
+  icon
+  description
+  content
+  isCustom
+  isActive
+  applicationId
+  createdAt
+  updatedAt
+`;
+
+export const activateSkillQueryFactory = ({
+  input,
+  gqlFields = DEFAULT_SKILL_GQL_FIELDS,
+}: PerformMetadataQueryParams<ActivateSkillFactoryInput>) => ({
+  query: gql`
+    mutation ActivateSkill($id: UUID!) {
+      activateSkill(id: $id) {
+        ${gqlFields}
+      }
+    }
+  `,
+  variables: {
+    id: input.id,
+  },
+});
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/utils/activate-skill.util.ts b/packages/twenty-server/test/integration/metadata/suites/skill/utils/activate-skill.util.ts
new file mode 100644
index 00000000000..105a822717f
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/utils/activate-skill.util.ts
@@ -0,0 +1,43 @@
+import {
+  type ActivateSkillFactoryInput,
+  activateSkillQueryFactory,
+} from 'test/integration/metadata/suites/skill/utils/activate-skill-query-factory.util';
+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';
+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';
+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';
+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';
+
+import { type SkillDTO } from 'src/engine/metadata-modules/skill/dtos/skill.dto';
+
+export const activateSkill = async ({
+  input,
+  gqlFields,
+  expectToFail = false,
+  token,
+}: PerformMetadataQueryParams<ActivateSkillFactoryInput>): CommonResponseBody<{
+  activateSkill: SkillDTO;
+}> => {
+  const graphqlOperation = activateSkillQueryFactory({
+    input,
+    gqlFields,
+  });
+
+  const response = await makeMetadataAPIRequest(graphqlOperation, token);
+
+  if (expectToFail === true) {
+    warnIfNoErrorButExpectedToFail({
+      response,
+      errorMessage: 'Skill activation should have failed but did not',
+    });
+  }
+
+  if (expectToFail === false) {
+    warnIfErrorButNotExpectedToFail({
+      response,
+      errorMessage: 'Skill activation has failed but should not',
+    });
+  }
+
+  return { data: response.body.data, errors: response.body.errors };
+};
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/utils/create-skill-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/skill/utils/create-skill-query-factory.util.ts
new file mode 100644
index 00000000000..a6d4ab85863
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/utils/create-skill-query-factory.util.ts
@@ -0,0 +1,36 @@
+import gql from 'graphql-tag';
+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';
+
+import { type CreateSkillInput } from 'src/engine/metadata-modules/skill/dtos/create-skill.input';
+
+export type CreateSkillFactoryInput = CreateSkillInput;
+
+const DEFAULT_SKILL_GQL_FIELDS = `
+  id
+  name
+  label
+  icon
+  description
+  content
+  isCustom
+  isActive
+  applicationId
+  createdAt
+  updatedAt
+`;
+
+export const createSkillQueryFactory = ({
+  input,
+  gqlFields = DEFAULT_SKILL_GQL_FIELDS,
+}: PerformMetadataQueryParams<CreateSkillFactoryInput>) => ({
+  query: gql`
+    mutation CreateSkill($input: CreateSkillInput!) {
+      createSkill(input: $input) {
+        ${gqlFields}
+      }
+    }
+  `,
+  variables: {
+    input,
+  },
+});
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/utils/create-skill.util.ts b/packages/twenty-server/test/integration/metadata/suites/skill/utils/create-skill.util.ts
new file mode 100644
index 00000000000..3d0ca97117f
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/utils/create-skill.util.ts
@@ -0,0 +1,43 @@
+import {
+  type CreateSkillFactoryInput,
+  createSkillQueryFactory,
+} from 'test/integration/metadata/suites/skill/utils/create-skill-query-factory.util';
+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';
+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';
+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';
+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';
+
+import { type SkillDTO } from 'src/engine/metadata-modules/skill/dtos/skill.dto';
+
+export const createSkill = async ({
+  input,
+  gqlFields,
+  expectToFail = false,
+  token,
+}: PerformMetadataQueryParams<CreateSkillFactoryInput>): CommonResponseBody<{
+  createSkill: SkillDTO;
+}> => {
+  const graphqlOperation = createSkillQueryFactory({
+    input,
+    gqlFields,
+  });
+
+  const response = await makeMetadataAPIRequest(graphqlOperation, token);
+
+  if (expectToFail === true) {
+    warnIfNoErrorButExpectedToFail({
+      response,
+      errorMessage: 'Skill creation should have failed but did not',
+    });
+  }
+
+  if (expectToFail === false) {
+    warnIfErrorButNotExpectedToFail({
+      response,
+      errorMessage: 'Skill creation has failed but should not',
+    });
+  }
+
+  return { data: response.body.data, errors: response.body.errors };
+};
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/utils/deactivate-skill-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/skill/utils/deactivate-skill-query-factory.util.ts
new file mode 100644
index 00000000000..8b5d7cc5b2b
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/utils/deactivate-skill-query-factory.util.ts
@@ -0,0 +1,36 @@
+import gql from 'graphql-tag';
+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';
+
+export type DeactivateSkillFactoryInput = {
+  id: string;
+};
+
+const DEFAULT_SKILL_GQL_FIELDS = `
+  id
+  name
+  label
+  icon
+  description
+  content
+  isCustom
+  isActive
+  applicationId
+  createdAt
+  updatedAt
+`;
+
+export const deactivateSkillQueryFactory = ({
+  input,
+  gqlFields = DEFAULT_SKILL_GQL_FIELDS,
+}: PerformMetadataQueryParams<DeactivateSkillFactoryInput>) => ({
+  query: gql`
+    mutation DeactivateSkill($id: UUID!) {
+      deactivateSkill(id: $id) {
+        ${gqlFields}
+      }
+    }
+  `,
+  variables: {
+    id: input.id,
+  },
+});
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/utils/deactivate-skill.util.ts b/packages/twenty-server/test/integration/metadata/suites/skill/utils/deactivate-skill.util.ts
new file mode 100644
index 00000000000..f714dfc921b
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/utils/deactivate-skill.util.ts
@@ -0,0 +1,43 @@
+import {
+  type DeactivateSkillFactoryInput,
+  deactivateSkillQueryFactory,
+} from 'test/integration/metadata/suites/skill/utils/deactivate-skill-query-factory.util';
+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';
+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';
+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';
+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';
+
+import { type SkillDTO } from 'src/engine/metadata-modules/skill/dtos/skill.dto';
+
+export const deactivateSkill = async ({
+  input,
+  gqlFields,
+  expectToFail = false,
+  token,
+}: PerformMetadataQueryParams<DeactivateSkillFactoryInput>): CommonResponseBody<{
+  deactivateSkill: SkillDTO;
+}> => {
+  const graphqlOperation = deactivateSkillQueryFactory({
+    input,
+    gqlFields,
+  });
+
+  const response = await makeMetadataAPIRequest(graphqlOperation, token);
+
+  if (expectToFail === true) {
+    warnIfNoErrorButExpectedToFail({
+      response,
+      errorMessage: 'Skill deactivation should have failed but did not',
+    });
+  }
+
+  if (expectToFail === false) {
+    warnIfErrorButNotExpectedToFail({
+      response,
+      errorMessage: 'Skill deactivation has failed but should not',
+    });
+  }
+
+  return { data: response.body.data, errors: response.body.errors };
+};
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/utils/delete-skill-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/skill/utils/delete-skill-query-factory.util.ts
new file mode 100644
index 00000000000..b214224e430
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/utils/delete-skill-query-factory.util.ts
@@ -0,0 +1,28 @@
+import gql from 'graphql-tag';
+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';
+
+export type DeleteSkillFactoryInput = {
+  id: string;
+};
+
+const DEFAULT_SKILL_GQL_FIELDS = `
+  id
+  name
+  label
+`;
+
+export const deleteSkillQueryFactory = ({
+  input,
+  gqlFields = DEFAULT_SKILL_GQL_FIELDS,
+}: PerformMetadataQueryParams<DeleteSkillFactoryInput>) => ({
+  query: gql`
+    mutation DeleteSkill($id: UUID!) {
+      deleteSkill(id: $id) {
+        ${gqlFields}
+      }
+    }
+  `,
+  variables: {
+    id: input.id,
+  },
+});
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/utils/delete-skill.util.ts b/packages/twenty-server/test/integration/metadata/suites/skill/utils/delete-skill.util.ts
new file mode 100644
index 00000000000..0806fa2e918
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/utils/delete-skill.util.ts
@@ -0,0 +1,43 @@
+import {
+  type DeleteSkillFactoryInput,
+  deleteSkillQueryFactory,
+} from 'test/integration/metadata/suites/skill/utils/delete-skill-query-factory.util';
+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';
+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';
+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';
+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';
+
+import { type SkillDTO } from 'src/engine/metadata-modules/skill/dtos/skill.dto';
+
+export const deleteSkill = async ({
+  input,
+  gqlFields,
+  expectToFail = false,
+  token,
+}: PerformMetadataQueryParams<DeleteSkillFactoryInput>): CommonResponseBody<{
+  deleteSkill: SkillDTO;
+}> => {
+  const graphqlOperation = deleteSkillQueryFactory({
+    input,
+    gqlFields,
+  });
+
+  const response = await makeMetadataAPIRequest(graphqlOperation, token);
+
+  if (expectToFail === true) {
+    warnIfNoErrorButExpectedToFail({
+      response,
+      errorMessage: 'Skill deletion should have failed but did not',
+    });
+  }
+
+  if (expectToFail === false) {
+    warnIfErrorButNotExpectedToFail({
+      response,
+      errorMessage: 'Skill deletion has failed but should not',
+    });
+  }
+
+  return { data: response.body.data, errors: response.body.errors };
+};
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/utils/find-skill-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/skill/utils/find-skill-query-factory.util.ts
new file mode 100644
index 00000000000..1399939692a
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/utils/find-skill-query-factory.util.ts
@@ -0,0 +1,36 @@
+import gql from 'graphql-tag';
+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';
+
+export type FindSkillFactoryInput = {
+  id: string;
+};
+
+const DEFAULT_SKILL_GQL_FIELDS = `
+  id
+  name
+  label
+  icon
+  description
+  content
+  isCustom
+  isActive
+  applicationId
+  createdAt
+  updatedAt
+`;
+
+export const findSkillQueryFactory = ({
+  input,
+  gqlFields = DEFAULT_SKILL_GQL_FIELDS,
+}: PerformMetadataQueryParams<FindSkillFactoryInput>) => ({
+  query: gql`
+    query Skill($id: UUID!) {
+      skill(id: $id) {
+        ${gqlFields}
+      }
+    }
+  `,
+  variables: {
+    id: input.id,
+  },
+});
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/utils/find-skill.util.ts b/packages/twenty-server/test/integration/metadata/suites/skill/utils/find-skill.util.ts
new file mode 100644
index 00000000000..853df1bae49
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/utils/find-skill.util.ts
@@ -0,0 +1,43 @@
+import {
+  type FindSkillFactoryInput,
+  findSkillQueryFactory,
+} from 'test/integration/metadata/suites/skill/utils/find-skill-query-factory.util';
+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';
+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';
+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';
+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';
+
+import { type SkillDTO } from 'src/engine/metadata-modules/skill/dtos/skill.dto';
+
+export const findSkill = async ({
+  input,
+  gqlFields,
+  expectToFail = false,
+  token,
+}: PerformMetadataQueryParams<FindSkillFactoryInput>): CommonResponseBody<{
+  skill: SkillDTO;
+}> => {
+  const graphqlOperation = findSkillQueryFactory({
+    input,
+    gqlFields,
+  });
+
+  const response = await makeMetadataAPIRequest(graphqlOperation, token);
+
+  if (expectToFail === true) {
+    warnIfNoErrorButExpectedToFail({
+      response,
+      errorMessage: 'Finding skill should have failed but did not',
+    });
+  }
+
+  if (expectToFail === false) {
+    warnIfErrorButNotExpectedToFail({
+      response,
+      errorMessage: 'Finding skill has failed but should not',
+    });
+  }
+
+  return { data: response.body.data, errors: response.body.errors };
+};
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/utils/find-skills-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/skill/utils/find-skills-query-factory.util.ts
new file mode 100644
index 00000000000..7726d2f8487
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/utils/find-skills-query-factory.util.ts
@@ -0,0 +1,27 @@
+import gql from 'graphql-tag';
+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';
+
+const DEFAULT_SKILL_GQL_FIELDS = `
+  id
+  name
+  label
+  icon
+  description
+  content
+  isCustom
+  applicationId
+  createdAt
+  updatedAt
+`;
+
+export const findSkillsQueryFactory = ({
+  gqlFields = DEFAULT_SKILL_GQL_FIELDS,
+}: PerformMetadataQueryParams<void>) => ({
+  query: gql`
+    query Skills {
+      skills {
+        ${gqlFields}
+      }
+    }
+  `,
+});
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/utils/find-skills.util.ts b/packages/twenty-server/test/integration/metadata/suites/skill/utils/find-skills.util.ts
new file mode 100644
index 00000000000..75e4ea812a7
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/utils/find-skills.util.ts
@@ -0,0 +1,39 @@
+import { findSkillsQueryFactory } from 'test/integration/metadata/suites/skill/utils/find-skills-query-factory.util';
+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';
+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';
+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';
+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';
+
+import { type SkillDTO } from 'src/engine/metadata-modules/skill/dtos/skill.dto';
+
+export const findSkills = async ({
+  gqlFields,
+  expectToFail = false,
+  token,
+}: PerformMetadataQueryParams<undefined>): CommonResponseBody<{
+  skills: SkillDTO[];
+}> => {
+  const graphqlOperation = findSkillsQueryFactory({
+    gqlFields,
+    input: undefined,
+  });
+
+  const response = await makeMetadataAPIRequest(graphqlOperation, token);
+
+  if (expectToFail === true) {
+    warnIfNoErrorButExpectedToFail({
+      response,
+      errorMessage: 'Finding skills should have failed but did not',
+    });
+  }
+
+  if (expectToFail === false) {
+    warnIfErrorButNotExpectedToFail({
+      response,
+      errorMessage: 'Finding skills has failed but should not',
+    });
+  }
+
+  return { data: response.body.data, errors: response.body.errors };
+};
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/utils/update-skill-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/skill/utils/update-skill-query-factory.util.ts
new file mode 100644
index 00000000000..4d24515a861
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/utils/update-skill-query-factory.util.ts
@@ -0,0 +1,36 @@
+import gql from 'graphql-tag';
+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';
+
+import { type UpdateSkillInput } from 'src/engine/metadata-modules/skill/dtos/update-skill.input';
+
+export type UpdateSkillFactoryInput = UpdateSkillInput;
+
+const DEFAULT_SKILL_GQL_FIELDS = `
+  id
+  name
+  label
+  icon
+  description
+  content
+  isCustom
+  isActive
+  applicationId
+  createdAt
+  updatedAt
+`;
+
+export const updateSkillQueryFactory = ({
+  gqlFields = DEFAULT_SKILL_GQL_FIELDS,
+  input,
+}: PerformMetadataQueryParams<UpdateSkillFactoryInput>) => ({
+  query: gql`
+    mutation UpdateSkill($input: UpdateSkillInput!) {
+      updateSkill(input: $input) {
+        ${gqlFields}
+      }
+    }
+  `,
+  variables: {
+    input,
+  },
+});
diff --git a/packages/twenty-server/test/integration/metadata/suites/skill/utils/update-skill.util.ts b/packages/twenty-server/test/integration/metadata/suites/skill/utils/update-skill.util.ts
new file mode 100644
index 00000000000..91c41dad6e3
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/skill/utils/update-skill.util.ts
@@ -0,0 +1,43 @@
+import {
+  type UpdateSkillFactoryInput,
+  updateSkillQueryFactory,
+} from 'test/integration/metadata/suites/skill/utils/update-skill-query-factory.util';
+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';
+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';
+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';
+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';
+
+import { type SkillDTO } from 'src/engine/metadata-modules/skill/dtos/skill.dto';
+
+export const updateSkill = async ({
+  input,
+  gqlFields,
+  expectToFail = false,
+  token,
+}: PerformMetadataQueryParams<UpdateSkillFactoryInput>): CommonResponseBody<{
+  updateSkill: SkillDTO;
+}> => {
+  const graphqlOperation = updateSkillQueryFactory({
+    input,
+    gqlFields,
+  });
+
+  const response = await makeMetadataAPIRequest(graphqlOperation, token);
+
+  if (expectToFail === true) {
+    warnIfNoErrorButExpectedToFail({
+      response,
+      errorMessage: 'Skill update should have failed but did not',
+    });
+  }
+
+  if (expectToFail === false) {
+    warnIfErrorButNotExpectedToFail({
+      response,
+      errorMessage: 'Skill update has failed but should not',
+    });
+  }
+
+  return { data: response.body.data, errors: response.body.errors };
+};
diff --git a/packages/twenty-server/test/integration/metadata/suites/view-filter-group/__snapshots__/failing-view-filter-group-creation-circular-dependency.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/view-filter-group/__snapshots__/failing-view-filter-group-creation-circular-dependency.integration-spec.ts.snap
index 36eaaf5b94f..a0e59928d78 100644
--- a/packages/twenty-server/test/integration/metadata/suites/view-filter-group/__snapshots__/failing-view-filter-group-creation-circular-dependency.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/view-filter-group/__snapshots__/failing-view-filter-group-creation-circular-dependency.integration-spec.ts.snap
@@ -20,6 +20,7 @@ exports[`View Filter Group creation should fail with circular dependency when id
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -63,6 +64,7 @@ exports[`View Filter Group creation should fail with circular dependency when id
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -97,6 +99,7 @@ exports[`View Filter Group creation should fail with circular dependency when ma
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -135,6 +138,7 @@ exports[`View Filter Group creation should fail with circular dependency when ma
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/view-filter-group/__snapshots__/failing-view-filter-group-creation.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/view-filter-group/__snapshots__/failing-view-filter-group-creation.integration-spec.ts.snap
index 3b6cdde5334..b738ccdf053 100644
--- a/packages/twenty-server/test/integration/metadata/suites/view-filter-group/__snapshots__/failing-view-filter-group-creation.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/view-filter-group/__snapshots__/failing-view-filter-group-creation.integration-spec.ts.snap
@@ -20,6 +20,7 @@ exports[`View Filter Group creation should fail when parentViewFilterGroupId doe
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -58,6 +59,7 @@ exports[`View Filter Group creation should fail when parentViewFilterGroupId doe
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -92,6 +94,7 @@ exports[`View Filter Group creation should fail when parentViewFilterGroupId equ
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -135,6 +138,7 @@ exports[`View Filter Group creation should fail when parentViewFilterGroupId equ
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -169,6 +173,7 @@ exports[`View Filter Group creation should fail when viewId does not exist 1`] =
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -207,6 +212,7 @@ exports[`View Filter Group creation should fail when viewId does not exist 1`] =
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/view-filter-group/__snapshots__/failing-view-filter-group-update-circular-dependency.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/view-filter-group/__snapshots__/failing-view-filter-group-update-circular-dependency.integration-spec.ts.snap
index 8041f40789d..39e77070643 100644
--- a/packages/twenty-server/test/integration/metadata/suites/view-filter-group/__snapshots__/failing-view-filter-group-update-circular-dependency.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/view-filter-group/__snapshots__/failing-view-filter-group-update-circular-dependency.integration-spec.ts.snap
@@ -20,6 +20,7 @@ exports[`View Filter Group update should fail with circular dependency when pare
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -58,6 +59,7 @@ exports[`View Filter Group update should fail with circular dependency when pare
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -92,6 +94,7 @@ exports[`View Filter Group update should fail with circular dependency when upda
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -130,6 +133,7 @@ exports[`View Filter Group update should fail with circular dependency when upda
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/view-filter-group/__snapshots__/failing-view-filter-group-update.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/view-filter-group/__snapshots__/failing-view-filter-group-update.integration-spec.ts.snap
index 220051da885..558324788f1 100644
--- a/packages/twenty-server/test/integration/metadata/suites/view-filter-group/__snapshots__/failing-view-filter-group-update.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/view-filter-group/__snapshots__/failing-view-filter-group-update.integration-spec.ts.snap
@@ -20,6 +20,7 @@ exports[`View Filter Group update should fail when parentViewFilterGroupId does
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [],
@@ -58,6 +59,7 @@ exports[`View Filter Group update should fail when parentViewFilterGroupId does
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/metadata/suites/view-filter/__snapshots__/failing-view-filter-creation.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/view-filter/__snapshots__/failing-view-filter-creation.integration-spec.ts.snap
index 8097ae1300f..9a981ec70da 100644
--- a/packages/twenty-server/test/integration/metadata/suites/view-filter/__snapshots__/failing-view-filter-creation.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/view-filter/__snapshots__/failing-view-filter-creation.integration-spec.ts.snap
@@ -20,6 +20,7 @@ exports[`View Filter creation should fail when fieldMetadataId does not exist 1`
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [
@@ -58,6 +59,7 @@ exports[`View Filter creation should fail when fieldMetadataId does not exist 1`
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -92,6 +94,7 @@ exports[`View Filter creation should fail when viewFilterGroupId does not exist
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [
@@ -135,6 +138,7 @@ exports[`View Filter creation should fail when viewFilterGroupId does not exist
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
@@ -169,6 +173,7 @@ exports[`View Filter creation should fail when viewId does not exist 1`] = `
       "rowLevelPermissionPredicate": [],
       "rowLevelPermissionPredicateGroup": [],
       "serverlessFunction": [],
+      "skill": [],
       "view": [],
       "viewField": [],
       "viewFilter": [
@@ -212,6 +217,7 @@ exports[`View Filter creation should fail when viewId does not exist 1`] = `
       "invalidRowLevelPermissionPredicate": 0,
       "invalidRowLevelPermissionPredicateGroup": 0,
       "invalidServerlessFunction": 0,
+      "invalidSkill": 0,
       "invalidView": 0,
       "invalidViewField": 0,
       "invalidViewFilter": 0,
diff --git a/packages/twenty-server/test/integration/rest/suites/__snapshots__/view-group.integration-spec.ts.snap b/packages/twenty-server/test/integration/rest/suites/__snapshots__/view-group.integration-spec.ts.snap
index ff003f07381..c7c8660c3b1 100644
--- a/packages/twenty-server/test/integration/rest/suites/__snapshots__/view-group.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/rest/suites/__snapshots__/view-group.integration-spec.ts.snap
@@ -19,6 +19,7 @@ exports[`View Group REST API POST /metadata/viewGroups should fail to create vie
     "rowLevelPermissionPredicate": [],
     "rowLevelPermissionPredicateGroup": [],
     "serverlessFunction": [],
+    "skill": [],
     "view": [],
     "viewField": [],
     "viewFilter": [],
@@ -59,6 +60,7 @@ exports[`View Group REST API POST /metadata/viewGroups should fail to create vie
     "invalidRowLevelPermissionPredicate": 0,
     "invalidRowLevelPermissionPredicateGroup": 0,
     "invalidServerlessFunction": 0,
+    "invalidSkill": 0,
     "invalidView": 0,
     "invalidViewField": 0,
     "invalidViewFilter": 0,
diff --git a/packages/twenty-shared/src/metadata/all-metadata-name.constant.ts b/packages/twenty-shared/src/metadata/all-metadata-name.constant.ts
index c7135bd3b77..3f34d17484c 100644
--- a/packages/twenty-shared/src/metadata/all-metadata-name.constant.ts
+++ b/packages/twenty-shared/src/metadata/all-metadata-name.constant.ts
@@ -16,6 +16,7 @@ export const ALL_METADATA_NAME = {
   role: 'role',
   roleTarget: 'roleTarget',
   agent: 'agent',
+  skill: 'skill',
   pageLayout: 'pageLayout',
   pageLayoutWidget: 'pageLayoutWidget',
   pageLayoutTab: 'pageLayoutTab',
diff --git a/packages/twenty-shared/src/types/SettingsPath.ts b/packages/twenty-shared/src/types/SettingsPath.ts
index 7936088fbbc..ad0077ea893 100644
--- a/packages/twenty-shared/src/types/SettingsPath.ts
+++ b/packages/twenty-shared/src/types/SettingsPath.ts
@@ -31,6 +31,8 @@ export enum SettingsPath {
   AINewAgent = 'ai/new-agent',
   AIAgentDetail = 'ai/agents/:agentId',
   AIAgentTurnDetail = 'ai/agents/:agentId/turns/:turnId',
+  AINewSkill = 'ai/new-skill',
+  AISkillDetail = 'ai/skills/:skillId',
   Applications = 'applications',
   ApplicationDetail = 'applications/:applicationId',
   ApplicationServerlessFunctionDetail = 'applications/:applicationId/serverlessFunctions/:serverlessFunctionId',
diff --git a/yarn.lock b/yarn.lock
index 07ed02a9166..83e4d1046a8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -23050,6 +23050,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tiptap/core@npm:3.4.2, @tiptap/core@npm:^3.4.2":
+  version: 3.4.2
+  resolution: "@tiptap/core@npm:3.4.2"
+  peerDependencies:
+    "@tiptap/pm": ^3.4.2
+  checksum: 10c0/da60f88603423c5c878276591e026e5458c4844557a28fc140d927dcc0611ea90cb05dff2a9d8f67ee34bb33c1ee686ae4c2c2e7bacfa1833bc548835f237267
+  languageName: node
+  linkType: hard
+
 "@tiptap/core@npm:^2.12.0":
   version: 2.12.0
   resolution: "@tiptap/core@npm:2.12.0"
@@ -23059,12 +23068,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/core@npm:^3.4.2":
+"@tiptap/extension-bold@npm:3.4.2":
   version: 3.4.2
-  resolution: "@tiptap/core@npm:3.4.2"
+  resolution: "@tiptap/extension-bold@npm:3.4.2"
   peerDependencies:
-    "@tiptap/pm": ^3.4.2
-  checksum: 10c0/da60f88603423c5c878276591e026e5458c4844557a28fc140d927dcc0611ea90cb05dff2a9d8f67ee34bb33c1ee686ae4c2c2e7bacfa1833bc548835f237267
+    "@tiptap/core": ^3.4.2
+  checksum: 10c0/f37a5701432f47c09e979c9944edccfe5fe0009b51666bd0719096e8744465bf3c38c5a405510af57aa275208bde408f6c1cd0d685a265d1659cc89ddca47cb4
   languageName: node
   linkType: hard
 
@@ -23077,15 +23086,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/extension-bold@npm:^3.4.2":
-  version: 3.4.2
-  resolution: "@tiptap/extension-bold@npm:3.4.2"
-  peerDependencies:
-    "@tiptap/core": ^3.4.2
-  checksum: 10c0/f37a5701432f47c09e979c9944edccfe5fe0009b51666bd0719096e8744465bf3c38c5a405510af57aa275208bde408f6c1cd0d685a265d1659cc89ddca47cb4
-  languageName: node
-  linkType: hard
-
 "@tiptap/extension-bubble-menu@npm:^2.12.0":
   version: 2.12.0
   resolution: "@tiptap/extension-bubble-menu@npm:2.12.0"
@@ -23099,14 +23099,14 @@ __metadata:
   linkType: hard
 
 "@tiptap/extension-bubble-menu@npm:^3.4.2":
-  version: 3.4.2
-  resolution: "@tiptap/extension-bubble-menu@npm:3.4.2"
+  version: 3.14.0
+  resolution: "@tiptap/extension-bubble-menu@npm:3.14.0"
   dependencies:
     "@floating-ui/dom": "npm:^1.0.0"
   peerDependencies:
-    "@tiptap/core": ^3.4.2
-    "@tiptap/pm": ^3.4.2
-  checksum: 10c0/f4d967f704a0bb85b436bdd6261f210eedbdfd3857ec2caf55df359dda2f6eb990b59f800efdb43593602ed92b069d9891b471855214a008a94b680d40117eb0
+    "@tiptap/core": ^3.14.0
+    "@tiptap/pm": ^3.14.0
+  checksum: 10c0/59244282681f9bdb923b8a8b1cb48cf4963b018405a4b40ba439970cf46c2c77f753b4442d787205c305e7f9abba0803acc712087586bdbfa841c64841b5d83f
   languageName: node
   linkType: hard
 
@@ -23119,7 +23119,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/extension-document@npm:^3.4.2":
+"@tiptap/extension-document@npm:3.4.2":
   version: 3.4.2
   resolution: "@tiptap/extension-document@npm:3.4.2"
   peerDependencies:
@@ -23141,13 +23141,13 @@ __metadata:
   linkType: hard
 
 "@tiptap/extension-floating-menu@npm:^3.4.2":
-  version: 3.4.2
-  resolution: "@tiptap/extension-floating-menu@npm:3.4.2"
+  version: 3.14.0
+  resolution: "@tiptap/extension-floating-menu@npm:3.14.0"
   peerDependencies:
     "@floating-ui/dom": ^1.0.0
-    "@tiptap/core": ^3.4.2
-    "@tiptap/pm": ^3.4.2
-  checksum: 10c0/7c54962faffa1d8bf0f35c1b6f28b8b6a13b2684cc06f248d4f693d0e8ca14232fde977fb747fcaccb2d84e0763627f24c43d48517649946fb1632962ad69929
+    "@tiptap/core": ^3.14.0
+    "@tiptap/pm": ^3.14.0
+  checksum: 10c0/fce19a2260b68c9857736304add2068e688066d44b9e1d26fdf715fdfd378d3e918aad04c5e1d9f9235ffd3ee3c57b62b046d76ebca305cd6b5eca29716fbfd6
   languageName: node
   linkType: hard
 
@@ -23161,7 +23161,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/extension-hard-break@npm:^3.4.2":
+"@tiptap/extension-hard-break@npm:3.4.2":
   version: 3.4.2
   resolution: "@tiptap/extension-hard-break@npm:3.4.2"
   peerDependencies:
@@ -23170,7 +23170,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/extension-heading@npm:^3.4.2":
+"@tiptap/extension-heading@npm:3.4.2":
   version: 3.4.2
   resolution: "@tiptap/extension-heading@npm:3.4.2"
   peerDependencies:
@@ -23199,7 +23199,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/extension-image@npm:^3.4.4":
+"@tiptap/extension-image@npm:3.4.4":
   version: 3.4.4
   resolution: "@tiptap/extension-image@npm:3.4.4"
   peerDependencies:
@@ -23208,6 +23208,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tiptap/extension-italic@npm:3.4.2":
+  version: 3.4.2
+  resolution: "@tiptap/extension-italic@npm:3.4.2"
+  peerDependencies:
+    "@tiptap/core": ^3.4.2
+  checksum: 10c0/ea18f40b4676d97bc85a8d29a9625239189567260a4f13ebde3aca9253c7514d9ad21cde9ecea97b6de2dabb54db392a0504d483385b185d112e702dc5f288f7
+  languageName: node
+  linkType: hard
+
 "@tiptap/extension-italic@npm:^2.11.5":
   version: 2.12.0
   resolution: "@tiptap/extension-italic@npm:2.12.0"
@@ -23217,12 +23226,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/extension-italic@npm:^3.4.2":
+"@tiptap/extension-link@npm:3.4.2":
   version: 3.4.2
-  resolution: "@tiptap/extension-italic@npm:3.4.2"
+  resolution: "@tiptap/extension-link@npm:3.4.2"
+  dependencies:
+    linkifyjs: "npm:^4.3.2"
   peerDependencies:
     "@tiptap/core": ^3.4.2
-  checksum: 10c0/ea18f40b4676d97bc85a8d29a9625239189567260a4f13ebde3aca9253c7514d9ad21cde9ecea97b6de2dabb54db392a0504d483385b185d112e702dc5f288f7
+    "@tiptap/pm": ^3.4.2
+  checksum: 10c0/6680403c34505f37ceb067c9277ccebc0f9b1126be570ca7f3e0730586963af0c483c9abb2ab8a88c3cfddb5d243fb49dbf920dc3ac0fcbc897a582919083808
   languageName: node
   linkType: hard
 
@@ -23238,18 +23250,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/extension-link@npm:^3.4.2":
-  version: 3.4.2
-  resolution: "@tiptap/extension-link@npm:3.4.2"
-  dependencies:
-    linkifyjs: "npm:^4.3.2"
-  peerDependencies:
-    "@tiptap/core": ^3.4.2
-    "@tiptap/pm": ^3.4.2
-  checksum: 10c0/6680403c34505f37ceb067c9277ccebc0f9b1126be570ca7f3e0730586963af0c483c9abb2ab8a88c3cfddb5d243fb49dbf920dc3ac0fcbc897a582919083808
-  languageName: node
-  linkType: hard
-
 "@tiptap/extension-list@npm:3.4.2":
   version: 3.4.2
   resolution: "@tiptap/extension-list@npm:3.4.2"
@@ -23260,6 +23260,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tiptap/extension-paragraph@npm:3.4.2":
+  version: 3.4.2
+  resolution: "@tiptap/extension-paragraph@npm:3.4.2"
+  peerDependencies:
+    "@tiptap/core": ^3.4.2
+  checksum: 10c0/350a76998f9142987284593c35e857387a1ad2acbbf984b7dd73c1dfb4cdc62ad03e331b614ce1ad1378ef8796c0a31641ea4c6511773bf13cf98cd9dc0f4fc5
+  languageName: node
+  linkType: hard
+
 "@tiptap/extension-paragraph@npm:^2.11.5":
   version: 2.12.0
   resolution: "@tiptap/extension-paragraph@npm:2.12.0"
@@ -23269,12 +23278,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/extension-paragraph@npm:^3.4.2":
+"@tiptap/extension-strike@npm:3.4.2":
   version: 3.4.2
-  resolution: "@tiptap/extension-paragraph@npm:3.4.2"
+  resolution: "@tiptap/extension-strike@npm:3.4.2"
   peerDependencies:
     "@tiptap/core": ^3.4.2
-  checksum: 10c0/350a76998f9142987284593c35e857387a1ad2acbbf984b7dd73c1dfb4cdc62ad03e331b614ce1ad1378ef8796c0a31641ea4c6511773bf13cf98cd9dc0f4fc5
+  checksum: 10c0/d763200cdcd579461492d6960705d56e9d5af4fcce026b826adc559ab5dbb2abb371cc65ac9e08b3398265a71a0bba96c864ed7a55ea69fdaf39e54d49ba8a6a
   languageName: node
   linkType: hard
 
@@ -23287,15 +23296,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/extension-strike@npm:^3.4.2":
-  version: 3.4.2
-  resolution: "@tiptap/extension-strike@npm:3.4.2"
-  peerDependencies:
-    "@tiptap/core": ^3.4.2
-  checksum: 10c0/d763200cdcd579461492d6960705d56e9d5af4fcce026b826adc559ab5dbb2abb371cc65ac9e08b3398265a71a0bba96c864ed7a55ea69fdaf39e54d49ba8a6a
-  languageName: node
-  linkType: hard
-
 "@tiptap/extension-table-cell@npm:^2.11.5":
   version: 2.12.0
   resolution: "@tiptap/extension-table-cell@npm:2.12.0"
@@ -23314,6 +23314,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tiptap/extension-text@npm:3.4.2":
+  version: 3.4.2
+  resolution: "@tiptap/extension-text@npm:3.4.2"
+  peerDependencies:
+    "@tiptap/core": ^3.4.2
+  checksum: 10c0/ee2f6fcda4151031e7969823ee6a32e40b3e95d3ab49e75f20c5d3264c13476ebc260ba3a74307796bb208bba667d9f608371c14b1806bd20ad6f41c209bdd56
+  languageName: node
+  linkType: hard
+
 "@tiptap/extension-text@npm:^2.11.5":
   version: 2.12.0
   resolution: "@tiptap/extension-text@npm:2.12.0"
@@ -23323,12 +23332,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/extension-text@npm:^3.4.2":
+"@tiptap/extension-underline@npm:3.4.2":
   version: 3.4.2
-  resolution: "@tiptap/extension-text@npm:3.4.2"
+  resolution: "@tiptap/extension-underline@npm:3.4.2"
   peerDependencies:
     "@tiptap/core": ^3.4.2
-  checksum: 10c0/ee2f6fcda4151031e7969823ee6a32e40b3e95d3ab49e75f20c5d3264c13476ebc260ba3a74307796bb208bba667d9f608371c14b1806bd20ad6f41c209bdd56
+  checksum: 10c0/f4b716e1dd10f3d56232fc6a1f658ca31733ea0c604ec8cf674cbe20b86c5ba84a99f32c60a85f99c87f10ee1e9967d4262a057ddfdfb513de8ff5ded7272e13
   languageName: node
   linkType: hard
 
@@ -23341,16 +23350,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/extension-underline@npm:^3.4.2":
-  version: 3.4.2
-  resolution: "@tiptap/extension-underline@npm:3.4.2"
-  peerDependencies:
-    "@tiptap/core": ^3.4.2
-  checksum: 10c0/f4b716e1dd10f3d56232fc6a1f658ca31733ea0c604ec8cf674cbe20b86c5ba84a99f32c60a85f99c87f10ee1e9967d4262a057ddfdfb513de8ff5ded7272e13
-  languageName: node
-  linkType: hard
-
-"@tiptap/extensions@npm:^3.4.2":
+"@tiptap/extensions@npm:3.4.2":
   version: 3.4.2
   resolution: "@tiptap/extensions@npm:3.4.2"
   peerDependencies:
@@ -23386,25 +23386,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/react@npm:^2.12.0":
-  version: 2.12.0
-  resolution: "@tiptap/react@npm:2.12.0"
-  dependencies:
-    "@tiptap/extension-bubble-menu": "npm:^2.12.0"
-    "@tiptap/extension-floating-menu": "npm:^2.12.0"
-    "@types/use-sync-external-store": "npm:^0.0.6"
-    fast-deep-equal: "npm:^3"
-    use-sync-external-store: "npm:^1"
-  peerDependencies:
-    "@tiptap/core": ^2.7.0
-    "@tiptap/pm": ^2.7.0
-    react: ^17.0.0 || ^18.0.0 || ^19.0.0
-    react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0
-  checksum: 10c0/f9769e35bf3c09e5bc5a01322041506319431005952d50b048355ab8009eee519090f5407cd428fe498aab7310b006c5523716364dfdbb6992a739c6373a8a8f
-  languageName: node
-  linkType: hard
-
-"@tiptap/react@npm:^3.4.2":
+"@tiptap/react@npm:3.4.2":
   version: 3.4.2
   resolution: "@tiptap/react@npm:3.4.2"
   dependencies:
@@ -23429,13 +23411,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/suggestion@npm:^3.4.2":
-  version: 3.9.0
-  resolution: "@tiptap/suggestion@npm:3.9.0"
+"@tiptap/react@npm:^2.12.0":
+  version: 2.12.0
+  resolution: "@tiptap/react@npm:2.12.0"
+  dependencies:
+    "@tiptap/extension-bubble-menu": "npm:^2.12.0"
+    "@tiptap/extension-floating-menu": "npm:^2.12.0"
+    "@types/use-sync-external-store": "npm:^0.0.6"
+    fast-deep-equal: "npm:^3"
+    use-sync-external-store: "npm:^1"
   peerDependencies:
-    "@tiptap/core": ^3.9.0
-    "@tiptap/pm": ^3.9.0
-  checksum: 10c0/40e54124cc65c8f0f752c9cee393070fb4f427aaf83b1f5a5c2f55dce32ed9bd5d39b94bf9825c0ed8f22f87116e6a9b788c83ddf6bafb2895cd46d061554c11
+    "@tiptap/core": ^2.7.0
+    "@tiptap/pm": ^2.7.0
+    react: ^17.0.0 || ^18.0.0 || ^19.0.0
+    react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0
+  checksum: 10c0/f9769e35bf3c09e5bc5a01322041506319431005952d50b048355ab8009eee519090f5407cd428fe498aab7310b006c5523716364dfdbb6992a739c6373a8a8f
+  languageName: node
+  linkType: hard
+
+"@tiptap/suggestion@npm:3.4.2":
+  version: 3.4.2
+  resolution: "@tiptap/suggestion@npm:3.4.2"
+  peerDependencies:
+    "@tiptap/core": ^3.4.2
+    "@tiptap/pm": ^3.4.2
+  checksum: 10c0/d52824c1e95fc517244814d71c3c864530cc3001458c7330699278f7921bd48a1160b0b72460ec7d9b8167ffa740720ad025fcec86a6cbc736e8a8d238a0c01f
   languageName: node
   linkType: hard
 
@@ -24736,6 +24736,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/marked@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "@types/marked@npm:6.0.0"
+  dependencies:
+    marked: "npm:*"
+  checksum: 10c0/1a831af52413b1a208c91539d3bdda9be83d5451dc094c3cbc07e3e07186970673b9ec3ad5edd6c136b1249875c41e22c39eacb3c00ea7c59d0873c35c273035
+  languageName: node
+  linkType: hard
+
 "@types/mdast@npm:^3.0.0":
   version: 3.0.15
   resolution: "@types/mdast@npm:3.0.15"
@@ -43731,6 +43740,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"marked@npm:*, marked@npm:^17.0.1":
+  version: 17.0.1
+  resolution: "marked@npm:17.0.1"
+  bin:
+    marked: bin/marked.js
+  checksum: 10c0/0197337aad33882308cea52d2c86d7b830a89be729a4010a26a488ae1c224cdc7520b8cce056832a81a127fc39a3827f45e3865c1ff257324cb553cb06ce0e57
+  languageName: node
+  linkType: hard
+
 "marked@npm:4.2.12":
   version: 4.2.12
   resolution: "marked@npm:4.2.12"
@@ -56662,26 +56680,27 @@ __metadata:
     "@react-pdf/renderer": "npm:^4.1.6"
     "@scalar/api-reference-react": "npm:^0.4.36"
     "@sentry/react": "npm:^10.27.0"
-    "@tiptap/core": "npm:^3.4.2"
-    "@tiptap/extension-bold": "npm:^3.4.2"
-    "@tiptap/extension-document": "npm:^3.4.2"
-    "@tiptap/extension-hard-break": "npm:^3.4.2"
-    "@tiptap/extension-heading": "npm:^3.4.2"
-    "@tiptap/extension-image": "npm:^3.4.4"
-    "@tiptap/extension-italic": "npm:^3.4.2"
-    "@tiptap/extension-link": "npm:^3.4.2"
+    "@tiptap/core": "npm:3.4.2"
+    "@tiptap/extension-bold": "npm:3.4.2"
+    "@tiptap/extension-document": "npm:3.4.2"
+    "@tiptap/extension-hard-break": "npm:3.4.2"
+    "@tiptap/extension-heading": "npm:3.4.2"
+    "@tiptap/extension-image": "npm:3.4.4"
+    "@tiptap/extension-italic": "npm:3.4.2"
+    "@tiptap/extension-link": "npm:3.4.2"
     "@tiptap/extension-list": "npm:3.4.2"
-    "@tiptap/extension-paragraph": "npm:^3.4.2"
-    "@tiptap/extension-strike": "npm:^3.4.2"
-    "@tiptap/extension-text": "npm:^3.4.2"
-    "@tiptap/extension-underline": "npm:^3.4.2"
-    "@tiptap/extensions": "npm:^3.4.2"
-    "@tiptap/react": "npm:^3.4.2"
-    "@tiptap/suggestion": "npm:^3.4.2"
+    "@tiptap/extension-paragraph": "npm:3.4.2"
+    "@tiptap/extension-strike": "npm:3.4.2"
+    "@tiptap/extension-text": "npm:3.4.2"
+    "@tiptap/extension-underline": "npm:3.4.2"
+    "@tiptap/extensions": "npm:3.4.2"
+    "@tiptap/react": "npm:3.4.2"
+    "@tiptap/suggestion": "npm:3.4.2"
     "@types/apollo-upload-client": "npm:^17.0.2"
     "@types/file-saver": "npm:^2.0.7"
     "@types/js-cookie": "npm:^3.0.3"
     "@types/json-logic-js": "npm:^2"
+    "@types/marked": "npm:^6.0.0"
     "@types/react-grid-layout": "npm:^1"
     "@typescript-eslint/eslint-plugin": "npm:^8.39.0"
     "@typescript-eslint/parser": "npm:^8.39.0"
@@ -56720,6 +56739,7 @@ __metadata:
     jwt-decode: "npm:^4.0.0"
     linkify-react: "npm:^4.1.3"
     linkifyjs: "npm:^4.1.3"
+    marked: "npm:^17.0.1"
     monaco-editor: "npm:^0.51.0"
     monaco-editor-auto-typings: "npm:^0.4.5"
     optionator: "npm:^0.9.1"