@contentful/mcp-tools 0.12.4 → 0.12.5

package/dist/index.js

@@ -336,10 +336,10 @@ var RESOURCE_DISPLAY_NAME = {
   locale: "locale",
   concept: "concept",
   conceptScheme: "concept scheme",
-  componentType: "component type",
+  component: "component",
   experience: "experience",
-  fragment: "fragment",
-  template: "template",
+  experienceFragment: "experience fragment",
+  experienceTemplate: "experience template",
   dataAssembly: "data assembly"
 };
 function buildConfirmationPreview(resource, id, details, confirmToken) {
@@ -2316,7 +2316,7 @@ var CORE_INVARIANTS = `# Core operating rules
 - **Ask when ambiguous.** If multiple spaces or environments are available, ask the user which to use. Do not guess.`;
 var SEARCHING_GUIDANCE = `# Searching for content
 
-- **Schema first.** When users ask about specific content, discover the relevant schema before searching: list the environment's available types and inspect a type's fields so you query on real field names. This prevents wasted queries. Use whichever primitives the environment exposes \u2014 classic content types and entries, or Experience Orchestration component types and experiences.
+- **Schema first.** When users ask about specific content, discover the relevant schema before searching: list the environment's available types and inspect a type's fields so you query on real field names. This prevents wasted queries. Use whichever primitives the environment exposes \u2014 classic content types and entries, or Experience Orchestration components and experiences.
 - **Then search.** Query using the correct type and field names. Prefer semantic search when the request is conceptual rather than an exact field match.
 - **Retry thoughtfully.** If a query returns no results, retry 2-3 times: relax filters, use more general terms, or check for typos in field names.
 - **Multi-step reference queries.** For requests that span references (e.g. "posts by Magnus"), first inspect the schema to confirm the reference field, then query for the referenced item to get its ID, then filter the primary query on that ID. If several items match, show them all and ask.`;
@@ -2329,7 +2329,7 @@ var CONVENTIONS_GUIDANCE = `# Response and workflow conventions
 - **Prefer bulk.** If you would call the same tool many times, check whether it supports multiple IDs and condense into one call (respecting the 10-ID cap on publish-family operations).`;
 var EXO_DISPOSITION = `# Tool disposition: Experience Orchestration by default
 
-Experience Orchestration (ExO) tools are enabled. Use ExO primitives \u2014 Component Types, Experiences, Templates, Fragments, and Data Assemblies \u2014 for all content modeling and authoring. Do not create classic content types or entries unless the user explicitly instructs you to. If you are unsure how to model something with ExO, inspect the tool schemas and proceed with ExO.`;
+Experience Orchestration (ExO) tools are enabled. Use ExO primitives \u2014 Components, Experiences, Experience Templates, Experience Fragments, and Data Assemblies \u2014 for all content modeling and authoring. Do not create classic content types or entries unless the user explicitly instructs you to. If you are unsure how to model something with ExO, inspect the tool schemas and proceed with ExO.`;
 
 // src/tools/context/getInitialContextTool.ts
 var GetInitialContextToolParams = z35.object({});
@@ -5711,39 +5711,39 @@ function createJobTools(config) {
   };
 }
 
-// src/tools/exo/component-types/getComponentType.ts
+// src/tools/exo/components/getComponent.ts
 import { z as z83 } from "zod";
-var GetComponentTypeToolParams = BaseToolSchema.extend({
-  componentTypeId: z83.string().describe("The ID of the component type to retrieve details for")
+var GetComponentToolParams = BaseToolSchema.extend({
+  componentId: z83.string().describe("The ID of the component to retrieve details for")
 });
-function getComponentTypeTool(config) {
+function getComponentTool(config) {
   async function tool2(args) {
     const contentfulClient = createToolClient(config, args);
-    const componentType = await contentfulClient.componentType.get({
+    const component = await contentfulClient.component.get({
       spaceId: args.spaceId,
       environmentId: args.environmentId,
-      componentTypeId: args.componentTypeId
+      componentId: args.componentId
     });
-    return createSuccessResponse("Component type retrieved successfully", {
-      componentType
+    return createSuccessResponse("Component retrieved successfully", {
+      component
     });
   }
-  return withErrorHandling(tool2, "Error retrieving component type");
+  return withErrorHandling(tool2, "Error retrieving component");
 }
 
-// src/tools/exo/component-types/listComponentTypes.ts
+// src/tools/exo/components/listComponents.ts
 import { z as z84 } from "zod";
-var ListComponentTypesToolParams = BaseToolSchema.extend({
-  limit: z84.number().optional().describe("Maximum number of component types to return (max 10)"),
+var ListComponentsToolParams = BaseToolSchema.extend({
+  limit: z84.number().optional().describe("Maximum number of components to return (max 10)"),
   pageNext: z84.string().optional().describe("Cursor token to fetch the next page of results"),
   pagePrev: z84.string().optional().describe("Cursor token to fetch the previous page of results"),
-  order: z84.string().optional().describe("Order component types by this field (e.g. sys.createdAt)")
+  order: z84.string().optional().describe("Order components by this field (e.g. sys.createdAt)")
 });
-function listComponentTypesTool(config) {
+function listComponentsTool(config) {
   async function tool2(args) {
     const contentfulClient = createToolClient(config, args);
     const cursorParam = args.pageNext ? { pageNext: args.pageNext } : args.pagePrev ? { pagePrev: args.pagePrev } : {};
-    const componentTypes = await contentfulClient.componentType.getMany({
+    const components = await contentfulClient.component.getMany({
       spaceId: args.spaceId,
       environmentId: args.environmentId,
       query: {
@@ -5752,29 +5752,29 @@ function listComponentTypesTool(config) {
         ...cursorParam
       }
     });
-    const summarized = summarizeData(componentTypes, {
+    const summarized = summarizeData(components, {
       maxItems: 10,
-      remainingMessage: "To see more component types, ask me to retrieve the next page using the pageNext cursor."
+      remainingMessage: "To see more components, ask me to retrieve the next page using the pageNext cursor."
     });
-    return createSuccessResponse("Component types retrieved successfully", {
-      componentTypes: summarized,
-      total: componentTypes.total,
-      limit: componentTypes.limit,
-      pages: componentTypes.pages
+    return createSuccessResponse("Components retrieved successfully", {
+      components: summarized,
+      total: components.total,
+      limit: components.limit,
+      pages: components.pages
     });
   }
-  return withErrorHandling(tool2, "Error listing component types");
+  return withErrorHandling(tool2, "Error listing components");
 }
 
-// src/tools/exo/component-types/createComponentType.ts
+// src/tools/exo/components/createComponent.ts
 import { z as z86 } from "zod";
 
-// src/types/componentTypeSchemas.ts
+// src/types/exoSchemas.ts
 import { z as z85 } from "zod";
 var URN_EXAMPLES = {
-  "Contentful:ComponentType": "crn:contentful:::experience:spaces/{spaceId}/environments/{envId}/componentTypes/{id}",
-  "Contentful:Fragment": "crn:contentful:::experience:spaces/{spaceId}/environments/{envId}/fragments/{id}",
-  "Contentful:Template": "crn:contentful:::experience:spaces/{spaceId}/environments/{envId}/templates/{id}",
+  "Contentful:Component": "crn:contentful:::experience:spaces/{spaceId}/environments/{envId}/components/{id}",
+  "Contentful:ExperienceFragment": "crn:contentful:::experience:spaces/{spaceId}/environments/{envId}/experienceFragments/{id}",
+  "Contentful:ExperienceTemplate": "crn:contentful:::experience:spaces/{spaceId}/environments/{envId}/experienceTemplates/{id}",
   "Contentful:DataAssembly": "crn:contentful:::experience:spaces/{spaceId}/environments/{envId}/dataAssemblies/{id}"
 };
 var resourceLinkSchema2 = (linkType) => {
@@ -5795,8 +5795,15 @@ var linkSchema2 = (linkType) => z85.object({
     id: z85.string()
   })
 });
-var ComponentTypeResourceLinkSchema = resourceLinkSchema2("Contentful:ComponentType");
-var FragmentResourceLinkSchema = resourceLinkSchema2("Contentful:Fragment");
+var ComponentResourceLinkSchema = resourceLinkSchema2(
+  "Contentful:Component"
+);
+var ExperienceFragmentResourceLinkSchema = resourceLinkSchema2(
+  "Contentful:ExperienceFragment"
+);
+var ExperienceTemplateResourceLinkSchema = resourceLinkSchema2(
+  "Contentful:ExperienceTemplate"
+);
 var ViewportSchema = z85.object({
   id: z85.string().describe("Viewport identifier"),
   query: z85.string().describe("CSS media query string"),
@@ -5909,19 +5916,21 @@ var DesignTokenValueSchema = z85.object({
   type: z85.literal("DesignToken"),
   value: z85.string().min(1).describe("Design token reference (non-empty)")
 });
-var TokenBackedDesignPropertySchema = DesignPropertyCommonFieldsSchema.extend({
-  type: z85.enum(DTCG_DESIGN_PROPERTY_TYPES),
-  fallbackValue: DesignTokenValueSchema.optional().describe(
-    "Design-token-backed fallback value for this design property"
-  ),
-  allowedResources: z85.array(
-    z85.object({
-      type: z85.literal("DesignToken"),
-      value: z85.string(),
-      name: z85.string().optional()
-    })
-  ).optional().describe("Allowed design token resources")
-});
+var TokenBackedDesignPropertySchema = DesignPropertyCommonFieldsSchema.extend(
+  {
+    type: z85.enum(DTCG_DESIGN_PROPERTY_TYPES),
+    fallbackValue: DesignTokenValueSchema.optional().describe(
+      "Design-token-backed fallback value for this design property"
+    ),
+    allowedResources: z85.array(
+      z85.object({
+        type: z85.literal("DesignToken"),
+        value: z85.string(),
+        name: z85.string().optional()
+      })
+    ).optional().describe("Allowed design token resources")
+  }
+);
 var DesignPropertySchema = z85.union([
   StringDesignPropertySchema,
   BooleanDesignPropertySchema,
@@ -5963,17 +5972,19 @@ var SlotDefinitionSchema = z85.object({
   ).describe("Slot cardinality validations"),
   allowedResources: z85.array(
     z85.object({
-      type: z85.literal("Contentful:ComponentType"),
+      type: z85.literal("Contentful:Component"),
       source: z85.literal(COMPONENT_TYPE_ALLOWED_RESOURCE_SOURCE),
-      allowedTypes: z85.array(z85.string()).describe("IDs of component types allowed in this slot")
+      allowedTypes: z85.array(z85.string()).describe("IDs of components allowed in this slot")
     })
-  ).optional().describe("Constrains which component types may be placed in this slot")
+  ).optional().describe("Constrains which components may be placed in this slot")
 });
-var FragmentNodeSchema = z85.object({
+var ExperienceFragmentNodeSchema = z85.object({
   id: z85.string().describe("Node identifier"),
   name: z85.string().optional().describe("Optional display name"),
-  nodeType: z85.literal("Fragment").describe('Must be "Fragment"'),
-  fragment: FragmentResourceLinkSchema.describe("Resource link to the referenced fragment")
+  nodeType: z85.literal("ExperienceFragment").describe('Must be "ExperienceFragment"'),
+  experienceFragment: ExperienceFragmentResourceLinkSchema.describe(
+    "Resource link to the referenced experience fragment"
+  )
 });
 var SlotNodeSchema = z85.object({
   id: z85.string().describe("Node identifier"),
@@ -5981,15 +5992,15 @@ var SlotNodeSchema = z85.object({
   slotId: z85.string().describe("ID of the slot definition to render")
 });
 var TreeNodeSchema = z85.lazy(
-  () => z85.union([ComponentNodeSchema, FragmentNodeSchema, SlotNodeSchema])
+  () => z85.union([ComponentNodeSchema, ExperienceFragmentNodeSchema, SlotNodeSchema])
 );
 var ComponentNodeSchema = z85.lazy(
   () => z85.object({
     id: z85.string().describe("Node identifier"),
     name: z85.string().optional().describe("Optional display name"),
     nodeType: z85.literal("Component").describe('Must be "Component"'),
-    componentType: ComponentTypeResourceLinkSchema.describe(
-      "Resource link to the component type to render"
+    component: ComponentResourceLinkSchema.describe(
+      "Resource link to the component to render"
     ),
     contentProperties: z85.union([
       z85.record(z85.string(), z85.unknown()),
@@ -6012,7 +6023,9 @@ var ExoMetadataSchema = z85.object({
 var ExperienceMetadataSchema = ExoMetadataSchema.extend({
   name: z85.string().optional().describe("Variant label for this metadata entry")
 });
-var DataAssemblyResourceLinkSchema = resourceLinkSchema2("Contentful:DataAssembly");
+var DataAssemblyResourceLinkSchema = resourceLinkSchema2(
+  "Contentful:DataAssembly"
+);
 var ExperienceContentBindingsSchema = z85.object({
   sys: DataAssemblyResourceLinkSchema.shape.sys,
   parameters: z85.record(
@@ -6026,29 +6039,29 @@ var ExperienceContentBindingsSchema = z85.object({
     })
   ).describe("Parameter bindings keyed by parameter ID")
 });
-var InlineFragmentNodeSchema = z85.lazy(
+var InlineExperienceFragmentNodeSchema = z85.lazy(
   () => z85.object({
     id: z85.string().describe("Node identifier"),
-    nodeType: z85.literal("InlineFragment").describe('Must be "InlineFragment"'),
-    componentType: ComponentTypeResourceLinkSchema.describe(
-      "Resource link to the component type this inline fragment renders"
+    nodeType: z85.literal("InlineExperienceFragment").describe('Must be "InlineExperienceFragment"'),
+    component: ComponentResourceLinkSchema.describe(
+      "Resource link to the component this inline experience fragment renders"
     ),
-    designProperties: z85.record(z85.string(), DimensionedDesignPropertyValueSchema).describe("Design property values for this inline fragment"),
+    designProperties: z85.record(z85.string(), DimensionedDesignPropertyValueSchema).describe("Design property values for this inline experience fragment"),
     contentBindings: ExperienceContentBindingsSchema.optional().describe(
-      "Optional content bindings linking this inline fragment to a data assembly"
+      "Optional content bindings linking this inline experience fragment to a data assembly"
     ),
     slots: z85.record(z85.string(), z85.array(ExperienceSlotNodeSchema)).optional().describe("Child slot contents keyed by slot ID")
   })
 );
 var ExperienceSlotNodeSchema = z85.lazy(
-  () => z85.union([FragmentNodeSchema, InlineFragmentNodeSchema])
+  () => z85.union([ExperienceFragmentNodeSchema, InlineExperienceFragmentNodeSchema])
 );
 
-// src/tools/exo/component-types/createComponentType.ts
-var CreateComponentTypeToolParams = BaseToolSchema.extend({
-  name: z86.string().describe("The name of the component type"),
-  description: z86.string().describe("Description of the component type"),
-  viewports: z86.array(ViewportSchema).describe("Viewport definitions for the component type (may be empty)"),
+// src/tools/exo/components/createComponent.ts
+var CreateComponentToolParams = BaseToolSchema.extend({
+  name: z86.string().describe("The name of the component"),
+  description: z86.string().describe("Description of the component"),
+  viewports: z86.array(ViewportSchema).describe("Viewport definitions for the component (may be empty)"),
   contentProperties: z86.array(ContentPropertySchema).describe("Content property definitions (may be empty)"),
   designProperties: z86.array(DesignPropertySchema).describe("Design property definitions (may be empty)"),
   componentTree: z86.array(TreeNodeSchema).optional().describe("Optional component tree node definitions"),
@@ -6057,14 +6070,14 @@ var CreateComponentTypeToolParams = BaseToolSchema.extend({
     "Optional ExO metadata (tags, concepts)"
   )
 });
-function createComponentTypeTool(config) {
+function createComponentTool(config) {
   async function tool2(args) {
     assertEnvironmentNotProtected(
       args.environmentId,
       config.protectedEnvironments
     );
     const contentfulClient = createToolClient(config, args);
-    const componentType = await contentfulClient.componentType.create(
+    const component = await contentfulClient.component.create(
       { spaceId: args.spaceId, environmentId: args.environmentId },
       {
         name: args.name,
@@ -6077,22 +6090,22 @@ function createComponentTypeTool(config) {
         ...args.metadata && { metadata: args.metadata }
       }
     );
-    return createSuccessResponse("Component type created successfully", {
-      componentType
+    return createSuccessResponse("Component created successfully", {
+      component
     });
   }
-  return withErrorHandling(tool2, "Error creating component type");
+  return withErrorHandling(tool2, "Error creating component");
 }
 
-// src/tools/exo/component-types/upsertComponentType.ts
+// src/tools/exo/components/upsertComponent.ts
 import { z as z87 } from "zod";
-var UpsertComponentTypeToolParams = BaseToolSchema.extend({
-  componentTypeId: z87.string().describe("The ID of the component type to update"),
+var UpsertComponentToolParams = BaseToolSchema.extend({
+  componentId: z87.string().describe("The ID of the component to update"),
   version: z87.number().describe(
-    "REQUIRED. The component type's sys.version as returned by get_component_type. You must call get_component_type first to read the current state and version. The update is rejected if this does not match the current version, which means the component type changed since you read it."
+    "REQUIRED. The component's sys.version as returned by get_component. You must call get_component first to read the current state and version. The update is rejected if this does not match the current version, which means the component changed since you read it."
   ),
-  name: z87.string().optional().describe("The name of the component type"),
-  description: z87.string().optional().describe("Description of the component type"),
+  name: z87.string().optional().describe("The name of the component"),
+  description: z87.string().optional().describe("Description of the component"),
   viewports: z87.array(ViewportSchema).optional().describe("Viewport definitions; replaces existing viewports if provided"),
   contentProperties: z87.array(ContentPropertySchema).optional().describe("Content property definitions; replaces existing if provided"),
   designProperties: z87.array(DesignPropertySchema).optional().describe("Design property definitions; replaces existing if provided"),
@@ -6102,7 +6115,7 @@ var UpsertComponentTypeToolParams = BaseToolSchema.extend({
     "ExO metadata (tags, concepts); replaces existing if provided"
   )
 });
-function upsertComponentTypeTool(config) {
+function upsertComponentTool(config) {
   async function tool2(args) {
     assertEnvironmentNotProtected(
       args.environmentId,
@@ -6111,19 +6124,19 @@ function upsertComponentTypeTool(config) {
     const params = {
       spaceId: args.spaceId,
       environmentId: args.environmentId,
-      componentTypeId: args.componentTypeId
+      componentId: args.componentId
     };
     const contentfulClient = createToolClient(config, args);
-    const current = await contentfulClient.componentType.get(params);
+    const current = await contentfulClient.component.get(params);
     if (args.version !== current.sys.version) {
       throw new Error(
-        `Version conflict: the component type has changed since you read it (your version: ${args.version}, current version: ${current.sys.version}). Re-fetch the component type with get_component_type and retry the update with the latest sys.version.`
+        `Version conflict: the component has changed since you read it (your version: ${args.version}, current version: ${current.sys.version}). Re-fetch the component with get_component and retry the update with the latest sys.version.`
       );
     }
-    const componentType = await contentfulClient.componentType.upsert(params, {
+    const component = await contentfulClient.component.upsert(params, {
       sys: {
         id: current.sys.id,
-        type: "ComponentType",
+        type: "Component",
         version: current.sys.version
       },
       name: args.name ?? current.name,
@@ -6136,17 +6149,17 @@ function upsertComponentTypeTool(config) {
       ...args.metadata ?? current.metadata ? { metadata: args.metadata ?? current.metadata } : {},
       ...current.dataAssemblies ? { dataAssemblies: current.dataAssemblies } : {}
     });
-    return createSuccessResponse("Component type updated successfully", {
-      componentType
+    return createSuccessResponse("Component updated successfully", {
+      component
     });
   }
-  return withErrorHandling(tool2, "Error updating component type");
+  return withErrorHandling(tool2, "Error updating component");
 }
 
-// src/tools/exo/component-types/deleteComponentType.ts
+// src/tools/exo/components/deleteComponent.ts
 import { z as z88 } from "zod";
-var DeleteComponentTypeToolParams = BaseToolSchema.extend({
-  componentTypeId: z88.string().describe("The ID of the component type to delete"),
+var DeleteComponentToolParams = BaseToolSchema.extend({
+  componentId: z88.string().describe("The ID of the component to delete"),
   confirm: z88.boolean().optional().describe(
     "Set to true on the second call to actually perform the deletion. Required together with confirmToken."
   ),
@@ -6154,7 +6167,7 @@ var DeleteComponentTypeToolParams = BaseToolSchema.extend({
     "Token returned by the preview call; must be supplied with confirm: true."
   )
 });
-function deleteComponentTypeTool(config) {
+function deleteComponentTool(config) {
   async function tool2(args) {
     assertEnvironmentNotProtected(
       args.environmentId,
@@ -6163,43 +6176,43 @@ function deleteComponentTypeTool(config) {
     const params = {
       spaceId: args.spaceId,
       environmentId: args.environmentId,
-      componentTypeId: args.componentTypeId
+      componentId: args.componentId
     };
     const contentfulClient = createToolClient(config, args);
-    const componentType = await contentfulClient.componentType.get(params);
+    const component = await contentfulClient.component.get(params);
     const expectedToken = buildConfirmToken(
-      "componentType",
-      args.componentTypeId,
-      componentType.sys.version
+      "component",
+      args.componentId,
+      component.sys.version
     );
     if (args.confirm !== true || args.confirmToken !== expectedToken) {
       return createSuccessResponse(
-        `${CONFIRMATION_MESSAGE_PREFIX} component type`,
+        `${CONFIRMATION_MESSAGE_PREFIX} component`,
         buildConfirmationPreview(
-          "componentType",
-          args.componentTypeId,
-          { componentType },
+          "component",
+          args.componentId,
+          { component },
           expectedToken
         )
       );
     }
-    await contentfulClient.componentType.delete(params);
-    return createSuccessResponse("Component type deleted successfully", {
-      componentTypeId: args.componentTypeId
+    await contentfulClient.component.delete(params);
+    return createSuccessResponse("Component deleted successfully", {
+      componentId: args.componentId
     });
   }
-  return withErrorHandling(tool2, "Error deleting component type");
+  return withErrorHandling(tool2, "Error deleting component");
 }
 
-// src/tools/exo/component-types/publishComponentType.ts
+// src/tools/exo/components/publishComponent.ts
 import { z as z89 } from "zod";
-var PublishComponentTypeToolParams = BaseToolSchema.extend({
-  componentTypeId: z89.string().describe("The ID of the component type to publish"),
+var PublishComponentToolParams = BaseToolSchema.extend({
+  componentId: z89.string().describe("The ID of the component to publish"),
   version: z89.number().describe(
-    "REQUIRED. The component type's sys.version as returned by get_component_type. You must call get_component_type first to read the current state and version. The publish is rejected if this does not match the current version, which means the component type changed since you read it."
+    "REQUIRED. The component's sys.version as returned by get_component. You must call get_component first to read the current state and version. The publish is rejected if this does not match the current version, which means the component changed since you read it."
   )
 });
-function publishComponentTypeTool(config) {
+function publishComponentTool(config) {
   async function tool2(args) {
     assertEnvironmentNotProtected(
       args.environmentId,
@@ -6208,35 +6221,35 @@ function publishComponentTypeTool(config) {
     const params = {
       spaceId: args.spaceId,
       environmentId: args.environmentId,
-      componentTypeId: args.componentTypeId
+      componentId: args.componentId
     };
     const contentfulClient = createToolClient(config, args);
-    const current = await contentfulClient.componentType.get(params);
+    const current = await contentfulClient.component.get(params);
     if (args.version !== current.sys.version) {
       throw new Error(
-        `Version conflict: the component type has changed since you read it (your version: ${args.version}, current version: ${current.sys.version}). Re-fetch the component type with get_component_type and retry with the latest sys.version.`
+        `Version conflict: the component has changed since you read it (your version: ${args.version}, current version: ${current.sys.version}). Re-fetch the component with get_component and retry with the latest sys.version.`
       );
     }
-    const componentType = await contentfulClient.componentType.publish({
+    const component = await contentfulClient.component.publish({
       ...params,
       version: args.version
     });
-    return createSuccessResponse("Component type published successfully", {
-      componentType
+    return createSuccessResponse("Component published successfully", {
+      component
     });
   }
-  return withErrorHandling(tool2, "Error publishing component type");
+  return withErrorHandling(tool2, "Error publishing component");
 }
 
-// src/tools/exo/component-types/unpublishComponentType.ts
+// src/tools/exo/components/unpublishComponent.ts
 import { z as z90 } from "zod";
-var UnpublishComponentTypeToolParams = BaseToolSchema.extend({
-  componentTypeId: z90.string().describe("The ID of the component type to unpublish"),
+var UnpublishComponentToolParams = BaseToolSchema.extend({
+  componentId: z90.string().describe("The ID of the component to unpublish"),
   version: z90.number().describe(
-    "REQUIRED. The component type's sys.version as returned by get_component_type. You must call get_component_type first to read the current state and version. The unpublish is rejected if this does not match the current version, which means the component type changed since you read it."
+    "REQUIRED. The component's sys.version as returned by get_component. You must call get_component first to read the current state and version. The unpublish is rejected if this does not match the current version, which means the component changed since you read it."
   )
 });
-function unpublishComponentTypeTool(config) {
+function unpublishComponentTool(config) {
   async function tool2(args) {
     assertEnvironmentNotProtected(
       args.environmentId,
@@ -6245,153 +6258,153 @@ function unpublishComponentTypeTool(config) {
     const params = {
       spaceId: args.spaceId,
       environmentId: args.environmentId,
-      componentTypeId: args.componentTypeId
+      componentId: args.componentId
     };
     const contentfulClient = createToolClient(config, args);
-    const current = await contentfulClient.componentType.get(params);
+    const current = await contentfulClient.component.get(params);
     if (args.version !== current.sys.version) {
       throw new Error(
-        `Version conflict: the component type has changed since you read it (your version: ${args.version}, current version: ${current.sys.version}). Re-fetch the component type with get_component_type and retry with the latest sys.version.`
+        `Version conflict: the component has changed since you read it (your version: ${args.version}, current version: ${current.sys.version}). Re-fetch the component with get_component and retry with the latest sys.version.`
       );
     }
-    const componentType = await contentfulClient.componentType.unpublish({
+    const component = await contentfulClient.component.unpublish({
       ...params,
       version: args.version
     });
-    return createSuccessResponse("Component type unpublished successfully", {
-      componentType
+    return createSuccessResponse("Component unpublished successfully", {
+      component
     });
   }
-  return withErrorHandling(tool2, "Error unpublishing component type");
+  return withErrorHandling(tool2, "Error unpublishing component");
 }
 
-// src/tools/exo/component-types/register.ts
-function createComponentTypeTools(config) {
-  const getComponentType = getComponentTypeTool(config);
-  const listComponentTypes = listComponentTypesTool(config);
-  const createComponentType = createComponentTypeTool(config);
-  const upsertComponentType = upsertComponentTypeTool(config);
-  const deleteComponentType = deleteComponentTypeTool(config);
-  const publishComponentType = publishComponentTypeTool(config);
-  const unpublishComponentType = unpublishComponentTypeTool(config);
+// src/tools/exo/components/register.ts
+function createComponentTools(config) {
+  const getComponent = getComponentTool(config);
+  const listComponents = listComponentsTool(config);
+  const createComponent = createComponentTool(config);
+  const upsertComponent = upsertComponentTool(config);
+  const deleteComponent = deleteComponentTool(config);
+  const publishComponent = publishComponentTool(config);
+  const unpublishComponent = unpublishComponentTool(config);
   return {
-    getComponentType: {
-      title: "get_component_type",
-      description: "Get details about a specific ExO component type (a reusable section/pattern template defining slots, content properties, and design properties).",
-      inputParams: GetComponentTypeToolParams.shape,
+    getComponent: {
+      title: "get_component",
+      description: "Get details about a specific ExO component (a reusable section/pattern template defining slots, content properties, and design properties).",
+      inputParams: GetComponentToolParams.shape,
       annotations: {
         readOnlyHint: true,
         destructiveHint: false,
         openWorldHint: false
       },
-      tool: getComponentType
+      tool: getComponent
     },
-    listComponentTypes: {
-      title: "list_component_types",
-      description: "List ExO component types in a space and environment. Returns a maximum of 10 items per request; use the pageNext cursor (returned in pages.next) to paginate.",
-      inputParams: ListComponentTypesToolParams.shape,
+    listComponents: {
+      title: "list_components",
+      description: "List ExO components in a space and environment. Returns a maximum of 10 items per request; use the pageNext cursor (returned in pages.next) to paginate.",
+      inputParams: ListComponentsToolParams.shape,
       annotations: {
         readOnlyHint: true,
         destructiveHint: false,
         openWorldHint: false
       },
-      tool: listComponentTypes
+      tool: listComponents
     },
-    createComponentType: {
-      title: "create_component_type",
-      description: "Create a new ExO component type.",
-      inputParams: CreateComponentTypeToolParams.shape,
+    createComponent: {
+      title: "create_component",
+      description: "Create a new ExO component.",
+      inputParams: CreateComponentToolParams.shape,
       annotations: {
         readOnlyHint: false,
         destructiveHint: false,
         idempotentHint: false,
         openWorldHint: false
       },
-      tool: createComponentType
+      tool: createComponent
     },
-    upsertComponentType: {
-      title: "upsert_component_type",
-      description: "Update an existing ExO component type. You MUST call get_component_type first to read the current state, then pass the sys.version you received as the version parameter. The handler merges your updates with the existing component type fields, so you only need to provide the fields you want to change. If the version is stale (the component type changed since you read it), the update is rejected and you must re-fetch with get_component_type.",
-      inputParams: UpsertComponentTypeToolParams.shape,
+    upsertComponent: {
+      title: "upsert_component",
+      description: "Update an existing ExO component. You MUST call get_component first to read the current state, then pass the sys.version you received as the version parameter. The handler merges your updates with the existing component fields, so you only need to provide the fields you want to change. If the version is stale (the component changed since you read it), the update is rejected and you must re-fetch with get_component.",
+      inputParams: UpsertComponentToolParams.shape,
       annotations: {
         readOnlyHint: false,
         destructiveHint: false,
         idempotentHint: false,
         openWorldHint: false
       },
-      tool: upsertComponentType
+      tool: upsertComponent
     },
-    deleteComponentType: {
-      title: "delete_component_type",
-      description: "Delete an ExO component type. Two-phase: the first call (without confirm/confirmToken) returns a preview and a confirmToken. To complete the deletion, call again with the same componentTypeId, confirm: true, and the confirmToken from the preview.",
-      inputParams: DeleteComponentTypeToolParams.shape,
+    deleteComponent: {
+      title: "delete_component",
+      description: "Delete an ExO component. Two-phase: the first call (without confirm/confirmToken) returns a preview and a confirmToken. To complete the deletion, call again with the same componentId, confirm: true, and the confirmToken from the preview.",
+      inputParams: DeleteComponentToolParams.shape,
       annotations: {
         readOnlyHint: false,
         destructiveHint: true,
         idempotentHint: false,
         openWorldHint: false
       },
-      tool: deleteComponentType
+      tool: deleteComponent
     },
-    publishComponentType: {
-      title: "publish_component_type",
-      description: "Publish an ExO component type. You MUST call get_component_type first and pass the returned sys.version as the version parameter. If the version is stale the operation is rejected and you must re-fetch with get_component_type.",
-      inputParams: PublishComponentTypeToolParams.shape,
+    publishComponent: {
+      title: "publish_component",
+      description: "Publish an ExO component. You MUST call get_component first and pass the returned sys.version as the version parameter. If the version is stale the operation is rejected and you must re-fetch with get_component.",
+      inputParams: PublishComponentToolParams.shape,
       annotations: {
         readOnlyHint: false,
         destructiveHint: true,
         idempotentHint: true,
         openWorldHint: false
       },
-      tool: publishComponentType
+      tool: publishComponent
     },
-    unpublishComponentType: {
-      title: "unpublish_component_type",
-      description: "Unpublish an ExO component type. You MUST call get_component_type first and pass the returned sys.version as the version parameter. If the version is stale the operation is rejected and you must re-fetch with get_component_type.",
-      inputParams: UnpublishComponentTypeToolParams.shape,
+    unpublishComponent: {
+      title: "unpublish_component",
+      description: "Unpublish an ExO component. You MUST call get_component first and pass the returned sys.version as the version parameter. If the version is stale the operation is rejected and you must re-fetch with get_component.",
+      inputParams: UnpublishComponentToolParams.shape,
       annotations: {
         readOnlyHint: false,
         destructiveHint: true,
         idempotentHint: true,
         openWorldHint: false
       },
-      tool: unpublishComponentType
+      tool: unpublishComponent
     }
   };
 }
 
-// src/tools/exo/fragments/getFragment.ts
+// src/tools/exo/experience-fragments/getExperienceFragment.ts
 import { z as z91 } from "zod";
-var GetFragmentToolParams = BaseToolSchema.extend({
-  fragmentId: z91.string().describe("The ID of the fragment to retrieve details for")
+var GetExperienceFragmentToolParams = BaseToolSchema.extend({
+  experienceFragmentId: z91.string().describe("The ID of the experience fragment to retrieve details for")
 });
-function getFragmentTool(config) {
+function getExperienceFragmentTool(config) {
   async function tool2(args) {
     const contentfulClient = createToolClient(config, args);
-    const fragment = await contentfulClient.fragment.get({
+    const experienceFragment = await contentfulClient.experienceFragment.get({
       spaceId: args.spaceId,
       environmentId: args.environmentId,
-      fragmentId: args.fragmentId
+      experienceFragmentId: args.experienceFragmentId
     });
-    return createSuccessResponse("Fragment retrieved successfully", {
-      fragment
+    return createSuccessResponse("Experience fragment retrieved successfully", {
+      experienceFragment
     });
   }
-  return withErrorHandling(tool2, "Error retrieving fragment");
+  return withErrorHandling(tool2, "Error retrieving experience fragment");
 }
 
-// src/tools/exo/fragments/listFragments.ts
+// src/tools/exo/experience-fragments/listExperienceFragments.ts
 import { z as z92 } from "zod";
-var ListFragmentsToolParams = BaseToolSchema.extend({
-  limit: z92.number().optional().describe("Maximum number of fragments to return (max 10)"),
+var ListExperienceFragmentsToolParams = BaseToolSchema.extend({
+  limit: z92.number().optional().describe("Maximum number of experience fragments to return (max 10)"),
   pageNext: z92.string().optional().describe("Cursor token to fetch the next page of results"),
   pagePrev: z92.string().optional().describe("Cursor token to fetch the previous page of results"),
-  order: z92.string().optional().describe("Order fragments by this field (e.g. sys.createdAt)")
+  order: z92.string().optional().describe("Order experience fragments by this field (e.g. sys.createdAt)")
 });
-function listFragmentsTool(config) {
+function listExperienceFragmentsTool(config) {
   async function tool2(args) {
     const contentfulClient = createToolClient(config, args);
-    const fragments = await contentfulClient.fragment.getMany({
+    const experienceFragments = await contentfulClient.experienceFragment.getMany({
       spaceId: args.spaceId,
       environmentId: args.environmentId,
       query: {
@@ -6401,51 +6414,53 @@ function listFragmentsTool(config) {
         ...args.order && { order: args.order }
       }
     });
-    const summarized = summarizeData(fragments, {
+    const summarized = summarizeData(experienceFragments, {
       maxItems: 10,
-      remainingMessage: "To see more fragments, ask me to retrieve the next page using the pageNext cursor."
+      remainingMessage: "To see more experience fragments, ask me to retrieve the next page using the pageNext cursor."
     });
-    return createSuccessResponse("Fragments retrieved successfully", {
-      fragments: summarized,
-      total: fragments.total,
-      limit: fragments.limit,
-      pages: fragments.pages
+    return createSuccessResponse("ExperienceFragments retrieved successfully", {
+      experienceFragments: summarized,
+      total: experienceFragments.total,
+      limit: experienceFragments.limit,
+      pages: experienceFragments.pages
     });
   }
-  return withErrorHandling(tool2, "Error listing fragments");
+  return withErrorHandling(tool2, "Error listing experience fragments");
 }
 
-// src/tools/exo/fragments/createFragment.ts
+// src/tools/exo/experience-fragments/createExperienceFragment.ts
 import { z as z93 } from "zod";
-var CreateFragmentToolParams = BaseToolSchema.extend({
-  name: z93.string().describe("The name of the fragment"),
-  description: z93.string().describe("Description of the fragment"),
-  componentType: ComponentTypeResourceLinkSchema.describe(
-    "Resource link to the component type this fragment is based on"
+var CreateExperienceFragmentToolParams = BaseToolSchema.extend({
+  name: z93.string().describe("The name of the experience fragment"),
+  description: z93.string().describe("Description of the experience fragment"),
+  component: ComponentResourceLinkSchema.describe(
+    "Resource link to the component this experience fragment is based on"
   ),
   viewports: z93.array(ViewportSchema).describe("Viewport definitions (may be empty)"),
-  designProperties: z93.record(z93.string(), DimensionedDesignPropertyValueSchema).describe("Design property values keyed by property ID (may be empty object)"),
+  designProperties: z93.record(z93.string(), DimensionedDesignPropertyValueSchema).describe(
+    "Design property values keyed by property ID (may be empty object)"
+  ),
   contentBindings: ExperienceContentBindingsSchema.optional().describe(
-    "Optional content bindings for the fragment"
+    "Optional content bindings for the experience fragment"
   ),
   slots: z93.record(z93.string(), z93.array(ExperienceSlotNodeSchema)).optional().describe("Optional slot node definitions keyed by slot ID"),
   metadata: ExperienceMetadataSchema.optional().describe(
     "Optional ExO metadata (tags, concepts)"
   )
 });
-function createFragmentTool(config) {
+function createExperienceFragmentTool(config) {
   async function tool2(args) {
     assertEnvironmentNotProtected(
       args.environmentId,
       config.protectedEnvironments
     );
     const contentfulClient = createToolClient(config, args);
-    const fragment = await contentfulClient.fragment.create(
+    const experienceFragment = await contentfulClient.experienceFragment.create(
       { spaceId: args.spaceId, environmentId: args.environmentId },
       {
         name: args.name,
         description: args.description,
-        componentType: args.componentType,
+        component: args.component,
         viewports: args.viewports,
         designProperties: args.designProperties,
         ...args.contentBindings && { contentBindings: args.contentBindings },
@@ -6453,22 +6468,22 @@ function createFragmentTool(config) {
         ...args.metadata && { metadata: args.metadata }
       }
     );
-    return createSuccessResponse("Fragment created successfully", {
-      fragment
+    return createSuccessResponse("Experience fragment created successfully", {
+      experienceFragment
     });
   }
-  return withErrorHandling(tool2, "Error creating fragment");
+  return withErrorHandling(tool2, "Error creating experience fragment");
 }
 
-// src/tools/exo/fragments/updateFragment.ts
+// src/tools/exo/experience-fragments/updateExperienceFragment.ts
 import { z as z94 } from "zod";
-var UpdateFragmentToolParams = BaseToolSchema.extend({
-  fragmentId: z94.string().describe("The ID of the fragment to update"),
+var UpdateExperienceFragmentToolParams = BaseToolSchema.extend({
+  experienceFragmentId: z94.string().describe("The ID of the experience fragment to update"),
   version: z94.number().describe(
-    "REQUIRED. The fragment's sys.version as returned by get_fragment. You must call get_fragment first to read the current state and version. The update is rejected if this does not match the current version, which means the fragment changed since you read it."
+    "REQUIRED. The experience fragment's sys.version as returned by get_experience_fragment. You must call get_experience_fragment first to read the current state and version. The update is rejected if this does not match the current version, which means the experience fragment changed since you read it."
   ),
-  name: z94.string().optional().describe("The name of the fragment"),
-  description: z94.string().optional().describe("Description of the fragment"),
+  name: z94.string().optional().describe("The name of the experience fragment"),
+  description: z94.string().optional().describe("Description of the experience fragment"),
   viewports: z94.array(ViewportSchema).optional().describe("Viewport definitions; replaces existing viewports if provided"),
   designProperties: z94.record(z94.string(), DimensionedDesignPropertyValueSchema).optional().describe("Design property values; replaces existing if provided"),
   contentBindings: ExperienceContentBindingsSchema.optional().describe(
@@ -6479,7 +6494,7 @@ var UpdateFragmentToolParams = BaseToolSchema.extend({
     "ExO metadata (tags, concepts); replaces existing if provided"
   )
 });
-function updateFragmentTool(config) {
+function updateExperienceFragmentTool(config) {
   async function tool2(args) {
     assertEnvironmentNotProtected(
       args.environmentId,
@@ -6488,40 +6503,43 @@ function updateFragmentTool(config) {
     const params = {
       spaceId: args.spaceId,
       environmentId: args.environmentId,
-      fragmentId: args.fragmentId
+      experienceFragmentId: args.experienceFragmentId
     };
     const contentfulClient = createToolClient(config, args);
-    const current = await contentfulClient.fragment.get(params);
+    const current = await contentfulClient.experienceFragment.get(params);
     if (args.version !== current.sys.version) {
       throw new Error(
-        `Version conflict: the fragment has changed since you read it (your version: ${args.version}, current version: ${current.sys.version}). Re-fetch the fragment with get_fragment and retry the update with the latest sys.version.`
+        `Version conflict: the experience fragment has changed since you read it (your version: ${args.version}, current version: ${current.sys.version}). Re-fetch the experience fragment with get_experience_fragment and retry the update with the latest sys.version.`
       );
     }
-    const fragment = await contentfulClient.fragment.upsert(params, {
-      sys: {
-        id: current.sys.id,
-        type: "Fragment",
-        version: current.sys.version
-      },
-      name: args.name ?? current.name,
-      description: args.description ?? current.description,
-      viewports: args.viewports ?? current.viewports,
-      designProperties: args.designProperties ?? current.designProperties,
-      ...args.contentBindings ?? current.contentBindings ? { contentBindings: args.contentBindings ?? current.contentBindings } : {},
-      ...args.slots ?? current.slots ? { slots: args.slots ?? current.slots } : {},
-      ...args.metadata ?? current.metadata ? { metadata: args.metadata ?? current.metadata } : {}
-    });
-    return createSuccessResponse("Fragment updated successfully", {
-      fragment
+    const experienceFragment = await contentfulClient.experienceFragment.upsert(
+      params,
+      {
+        sys: {
+          id: current.sys.id,
+          type: "ExperienceFragment",
+          version: current.sys.version
+        },
+        name: args.name ?? current.name,
+        description: args.description ?? current.description,
+        viewports: args.viewports ?? current.viewports,
+        designProperties: args.designProperties ?? current.designProperties,
+        ...args.contentBindings ?? current.contentBindings ? { contentBindings: args.contentBindings ?? current.contentBindings } : {},
+        ...args.slots ?? current.slots ? { slots: args.slots ?? current.slots } : {},
+        ...args.metadata ?? current.metadata ? { metadata: args.metadata ?? current.metadata } : {}
+      }
+    );
+    return createSuccessResponse("Experience fragment updated successfully", {
+      experienceFragment
     });
   }
-  return withErrorHandling(tool2, "Error updating fragment");
+  return withErrorHandling(tool2, "Error updating experience fragment");
 }
 
-// src/tools/exo/fragments/deleteFragment.ts
+// src/tools/exo/experience-fragments/deleteExperienceFragment.ts
 import { z as z95 } from "zod";
-var DeleteFragmentToolParams = BaseToolSchema.extend({
-  fragmentId: z95.string().describe("The ID of the fragment to delete"),
+var DeleteExperienceFragmentToolParams = BaseToolSchema.extend({
+  experienceFragmentId: z95.string().describe("The ID of the experience fragment to delete"),
   confirm: z95.boolean().optional().describe(
     "Set to true on the second call to actually perform the deletion. Required together with confirmToken."
   ),
@@ -6529,7 +6547,7 @@ var DeleteFragmentToolParams = BaseToolSchema.extend({
     "Token returned by the preview call; must be supplied with confirm: true."
   )
 });
-function deleteFragmentTool(config) {
+function deleteExperienceFragmentTool(config) {
   async function tool2(args) {
     assertEnvironmentNotProtected(
       args.environmentId,
@@ -6538,43 +6556,43 @@ function deleteFragmentTool(config) {
     const params = {
       spaceId: args.spaceId,
       environmentId: args.environmentId,
-      fragmentId: args.fragmentId
+      experienceFragmentId: args.experienceFragmentId
     };
     const contentfulClient = createToolClient(config, args);
-    const fragment = await contentfulClient.fragment.get(params);
+    const experienceFragment = await contentfulClient.experienceFragment.get(params);
     const expectedToken = buildConfirmToken(
-      "fragment",
-      args.fragmentId,
-      fragment.sys.version
+      "experienceFragment",
+      args.experienceFragmentId,
+      experienceFragment.sys.version
     );
     if (args.confirm !== true || args.confirmToken !== expectedToken) {
       return createSuccessResponse(
-        `${CONFIRMATION_MESSAGE_PREFIX} fragment`,
+        `${CONFIRMATION_MESSAGE_PREFIX} experience fragment`,
         buildConfirmationPreview(
-          "fragment",
-          args.fragmentId,
-          { fragment },
+          "experienceFragment",
+          args.experienceFragmentId,
+          { experienceFragment },
           expectedToken
         )
       );
     }
-    await contentfulClient.fragment.delete(params);
-    return createSuccessResponse("Fragment deleted successfully", {
-      fragmentId: args.fragmentId
+    await contentfulClient.experienceFragment.delete(params);
+    return createSuccessResponse("Experience fragment deleted successfully", {
+      experienceFragmentId: args.experienceFragmentId
     });
   }
-  return withErrorHandling(tool2, "Error deleting fragment");
+  return withErrorHandling(tool2, "Error deleting experience fragment");
 }
 
-// src/tools/exo/fragments/publishFragment.ts
+// src/tools/exo/experience-fragments/publishExperienceFragment.ts
 import { z as z96 } from "zod";
-var PublishFragmentToolParams = BaseToolSchema.extend({
-  fragmentId: z96.string().describe("The ID of the fragment to publish"),
+var PublishExperienceFragmentToolParams = BaseToolSchema.extend({
+  experienceFragmentId: z96.string().describe("The ID of the experience fragment to publish"),
   version: z96.number().describe(
-    "REQUIRED. The fragment's sys.version as returned by get_fragment. You must call get_fragment first to read the current state and version. The publish is rejected if this does not match the current version, which means the fragment changed since you read it."
+    "REQUIRED. The experience fragment's sys.version as returned by get_experience_fragment. You must call get_experience_fragment first to read the current state and version. The publish is rejected if this does not match the current version, which means the experience fragment changed since you read it."
   )
 });
-function publishFragmentTool(config) {
+function publishExperienceFragmentTool(config) {
   async function tool2(args) {
     assertEnvironmentNotProtected(
       args.environmentId,
@@ -6583,35 +6601,35 @@ function publishFragmentTool(config) {
     const params = {
       spaceId: args.spaceId,
       environmentId: args.environmentId,
-      fragmentId: args.fragmentId
+      experienceFragmentId: args.experienceFragmentId
     };
     const contentfulClient = createToolClient(config, args);
-    const current = await contentfulClient.fragment.get(params);
+    const current = await contentfulClient.experienceFragment.get(params);
     if (args.version !== current.sys.version) {
       throw new Error(
-        `Version conflict: the fragment has changed since you read it (your version: ${args.version}, current version: ${current.sys.version}). Re-fetch the fragment with get_fragment and retry with the latest sys.version.`
+        `Version conflict: the experience fragment has changed since you read it (your version: ${args.version}, current version: ${current.sys.version}). Re-fetch the experience fragment with get_experience_fragment and retry with the latest sys.version.`
       );
     }
-    const fragment = await contentfulClient.fragment.publish({
+    const experienceFragment = await contentfulClient.experienceFragment.publish({
       ...params,
       version: args.version
     });
-    return createSuccessResponse("Fragment published successfully", {
-      fragment
+    return createSuccessResponse("Experience fragment published successfully", {
+      experienceFragment
     });
   }
-  return withErrorHandling(tool2, "Error publishing fragment");
+  return withErrorHandling(tool2, "Error publishing experience fragment");
 }
 
-// src/tools/exo/fragments/unpublishFragment.ts
+// src/tools/exo/experience-fragments/unpublishExperienceFragment.ts
 import { z as z97 } from "zod";
-var UnpublishFragmentToolParams = BaseToolSchema.extend({
-  fragmentId: z97.string().describe("The ID of the fragment to unpublish"),
+var UnpublishExperienceFragmentToolParams = BaseToolSchema.extend({
+  experienceFragmentId: z97.string().describe("The ID of the experience fragment to unpublish"),
   version: z97.number().describe(
-    "REQUIRED. The fragment's sys.version as returned by get_fragment. You must call get_fragment first to read the current state and version. The unpublish is rejected if this does not match the current version, which means the fragment changed since you read it."
+    "REQUIRED. The experience fragment's sys.version as returned by get_experience_fragment. You must call get_experience_fragment first to read the current state and version. The unpublish is rejected if this does not match the current version, which means the experience fragment changed since you read it."
   )
 });
-function unpublishFragmentTool(config) {
+function unpublishExperienceFragmentTool(config) {
   async function tool2(args) {
     assertEnvironmentNotProtected(
       args.environmentId,
@@ -6620,153 +6638,156 @@ function unpublishFragmentTool(config) {
     const params = {
       spaceId: args.spaceId,
       environmentId: args.environmentId,
-      fragmentId: args.fragmentId
+      experienceFragmentId: args.experienceFragmentId
     };
     const contentfulClient = createToolClient(config, args);
-    const current = await contentfulClient.fragment.get(params);
+    const current = await contentfulClient.experienceFragment.get(params);
     if (args.version !== current.sys.version) {
       throw new Error(
-        `Version conflict: the fragment has changed since you read it (your version: ${args.version}, current version: ${current.sys.version}). Re-fetch the fragment with get_fragment and retry with the latest sys.version.`
+        `Version conflict: the experience fragment has changed since you read it (your version: ${args.version}, current version: ${current.sys.version}). Re-fetch the experience fragment with get_experience_fragment and retry with the latest sys.version.`
       );
     }
-    const fragment = await contentfulClient.fragment.unpublish({
+    const experienceFragment = await contentfulClient.experienceFragment.unpublish({
       ...params,
       version: args.version
     });
-    return createSuccessResponse("Fragment unpublished successfully", {
-      fragment
-    });
+    return createSuccessResponse(
+      "Experience fragment unpublished successfully",
+      {
+        experienceFragment
+      }
+    );
   }
-  return withErrorHandling(tool2, "Error unpublishing fragment");
+  return withErrorHandling(tool2, "Error unpublishing experience fragment");
 }
 
-// src/tools/exo/fragments/register.ts
-function createFragmentTools(config) {
-  const getFragment = getFragmentTool(config);
-  const listFragments = listFragmentsTool(config);
-  const createFragment = createFragmentTool(config);
-  const updateFragment = updateFragmentTool(config);
-  const deleteFragment = deleteFragmentTool(config);
-  const publishFragment = publishFragmentTool(config);
-  const unpublishFragment = unpublishFragmentTool(config);
+// src/tools/exo/experience-fragments/register.ts
+function createExperienceFragmentTools(config) {
+  const getExperienceFragment = getExperienceFragmentTool(config);
+  const listExperienceFragments = listExperienceFragmentsTool(config);
+  const createExperienceFragment = createExperienceFragmentTool(config);
+  const updateExperienceFragment = updateExperienceFragmentTool(config);
+  const deleteExperienceFragment = deleteExperienceFragmentTool(config);
+  const publishExperienceFragment = publishExperienceFragmentTool(config);
+  const unpublishExperienceFragment = unpublishExperienceFragmentTool(config);
   return {
-    getFragment: {
-      title: "get_fragment",
-      description: "Get details about a specific ExO fragment (a reusable content unit that can be referenced across multiple Experiences and ComponentTypes).",
-      inputParams: GetFragmentToolParams.shape,
+    getExperienceFragment: {
+      title: "get_experience_fragment",
+      description: "Get details about a specific ExO experience fragment (a reusable content unit that can be referenced across multiple Experiences and Components).",
+      inputParams: GetExperienceFragmentToolParams.shape,
       annotations: {
         readOnlyHint: true,
         destructiveHint: false,
         openWorldHint: false
       },
-      tool: getFragment
+      tool: getExperienceFragment
     },
-    listFragments: {
-      title: "list_fragments",
-      description: "List ExO fragments in a space and environment. Returns a maximum of 10 items per request; use the pageNext cursor (returned in pages.next) to paginate.",
-      inputParams: ListFragmentsToolParams.shape,
+    listExperienceFragments: {
+      title: "list_experience_fragments",
+      description: "List ExO experience fragments in a space and environment. Returns a maximum of 10 items per request; use the pageNext cursor (returned in pages.next) to paginate.",
+      inputParams: ListExperienceFragmentsToolParams.shape,
       annotations: {
         readOnlyHint: true,
         destructiveHint: false,
         openWorldHint: false
       },
-      tool: listFragments
+      tool: listExperienceFragments
     },
-    createFragment: {
-      title: "create_fragment",
-      description: "Create a new ExO fragment.",
-      inputParams: CreateFragmentToolParams.shape,
+    createExperienceFragment: {
+      title: "create_experience_fragment",
+      description: "Create a new ExO experience fragment.",
+      inputParams: CreateExperienceFragmentToolParams.shape,
       annotations: {
         readOnlyHint: false,
         destructiveHint: false,
         idempotentHint: false,
         openWorldHint: false
       },
-      tool: createFragment
+      tool: createExperienceFragment
     },
-    updateFragment: {
-      title: "update_fragment",
-      description: "Update an existing ExO fragment. You MUST call get_fragment first to read the current state, then pass the sys.version you received as the version parameter. The handler merges your updates with the existing fragment fields, so you only need to provide the fields you want to change. If the version is stale (the fragment changed since you read it), the update is rejected and you must re-fetch with get_fragment.",
-      inputParams: UpdateFragmentToolParams.shape,
+    updateExperienceFragment: {
+      title: "update_experience_fragment",
+      description: "Update an existing ExO experience fragment. You MUST call get_experience_fragment first to read the current state, then pass the sys.version you received as the version parameter. The handler merges your updates with the existing experience fragment fields, so you only need to provide the fields you want to change. If the version is stale (the experience fragment changed since you read it), the update is rejected and you must re-fetch with get_experience_fragment.",
+      inputParams: UpdateExperienceFragmentToolParams.shape,
       annotations: {
         readOnlyHint: false,
         destructiveHint: false,
         idempotentHint: false,
         openWorldHint: false
       },
-      tool: updateFragment
+      tool: updateExperienceFragment
     },
-    deleteFragment: {
-      title: "delete_fragment",
-      description: "Delete an ExO fragment. Two-phase: the first call (without confirm/confirmToken) returns a preview and a confirmToken. To complete the deletion, call again with the same fragmentId, confirm: true, and the confirmToken from the preview.",
-      inputParams: DeleteFragmentToolParams.shape,
+    deleteExperienceFragment: {
+      title: "delete_experience_fragment",
+      description: "Delete an ExO experience fragment. Two-phase: the first call (without confirm/confirmToken) returns a preview and a confirmToken. To complete the deletion, call again with the same experienceFragmentId, confirm: true, and the confirmToken from the preview.",
+      inputParams: DeleteExperienceFragmentToolParams.shape,
       annotations: {
         readOnlyHint: false,
         destructiveHint: true,
         idempotentHint: false,
         openWorldHint: false
       },
-      tool: deleteFragment
+      tool: deleteExperienceFragment
     },
-    publishFragment: {
-      title: "publish_fragment",
-      description: "Publish an ExO fragment. You MUST call get_fragment first and pass the returned sys.version as the version parameter. If the version is stale the operation is rejected and you must re-fetch with get_fragment.",
-      inputParams: PublishFragmentToolParams.shape,
+    publishExperienceFragment: {
+      title: "publish_experience_fragment",
+      description: "Publish an ExO experience fragment. You MUST call get_experience_fragment first and pass the returned sys.version as the version parameter. If the version is stale the operation is rejected and you must re-fetch with get_experience_fragment.",
+      inputParams: PublishExperienceFragmentToolParams.shape,
       annotations: {
         readOnlyHint: false,
         destructiveHint: true,
         idempotentHint: true,
         openWorldHint: false
       },
-      tool: publishFragment
+      tool: publishExperienceFragment
     },
-    unpublishFragment: {
-      title: "unpublish_fragment",
-      description: "Unpublish an ExO fragment. You MUST call get_fragment first and pass the returned sys.version as the version parameter. If the version is stale the operation is rejected and you must re-fetch with get_fragment.",
-      inputParams: UnpublishFragmentToolParams.shape,
+    unpublishExperienceFragment: {
+      title: "unpublish_experience_fragment",
+      description: "Unpublish an ExO experience fragment. You MUST call get_experience_fragment first and pass the returned sys.version as the version parameter. If the version is stale the operation is rejected and you must re-fetch with get_experience_fragment.",
+      inputParams: UnpublishExperienceFragmentToolParams.shape,
       annotations: {
         readOnlyHint: false,
         destructiveHint: true,
         idempotentHint: true,
         openWorldHint: false
       },
-      tool: unpublishFragment
+      tool: unpublishExperienceFragment
     }
   };
 }
 
-// src/tools/exo/templates/getTemplate.ts
+// src/tools/exo/experience-templates/getExperienceTemplate.ts
 import { z as z98 } from "zod";
-var GetTemplateToolParams = BaseToolSchema.extend({
-  templateId: z98.string().describe("The ID of the template to retrieve details for")
+var GetExperienceTemplateToolParams = BaseToolSchema.extend({
+  experienceTemplateId: z98.string().describe("The ID of the experience template to retrieve details for")
 });
-function getTemplateTool(config) {
+function getExperienceTemplateTool(config) {
   async function tool2(args) {
     const contentfulClient = createToolClient(config, args);
-    const template = await contentfulClient.template.get({
+    const experienceTemplate = await contentfulClient.experienceTemplate.get({
       spaceId: args.spaceId,
       environmentId: args.environmentId,
-      templateId: args.templateId
+      experienceTemplateId: args.experienceTemplateId
     });
-    return createSuccessResponse("Template retrieved successfully", {
-      template
+    return createSuccessResponse("Experience template retrieved successfully", {
+      experienceTemplate
     });
   }
-  return withErrorHandling(tool2, "Error retrieving template");
+  return withErrorHandling(tool2, "Error retrieving experience template");
 }
 
-// src/tools/exo/templates/listTemplates.ts
+// src/tools/exo/experience-templates/listExperienceTemplates.ts
 import { z as z99 } from "zod";
-var ListTemplatesToolParams = BaseToolSchema.extend({
-  limit: z99.number().optional().describe("Maximum number of templates to return (max 10)"),
+var ListExperienceTemplatesToolParams = BaseToolSchema.extend({
+  limit: z99.number().optional().describe("Maximum number of experience templates to return (max 10)"),
   pageNext: z99.string().optional().describe("Cursor token to fetch the next page of results"),
   pagePrev: z99.string().optional().describe("Cursor token to fetch the previous page of results"),
-  order: z99.string().optional().describe("Order templates by this field (e.g. sys.createdAt)")
+  order: z99.string().optional().describe("Order experience templates by this field (e.g. sys.createdAt)")
 });
-function listTemplatesTool(config) {
+function listExperienceTemplatesTool(config) {
   async function tool2(args) {
     const contentfulClient = createToolClient(config, args);
-    const templates = await contentfulClient.template.getMany({
+    const experienceTemplates = await contentfulClient.experienceTemplate.getMany({
       spaceId: args.spaceId,
       environmentId: args.environmentId,
       query: {
@@ -6776,26 +6797,28 @@ function listTemplatesTool(config) {
         ...args.order && { order: args.order }
       }
     });
-    const summarized = summarizeData(templates, {
+    const summarized = summarizeData(experienceTemplates, {
       maxItems: 10,
-      remainingMessage: "To see more templates, ask me to retrieve the next page using the pageNext cursor."
+      remainingMessage: "To see more experience templates, ask me to retrieve the next page using the pageNext cursor."
     });
-    return createSuccessResponse("Templates retrieved successfully", {
-      templates: summarized,
-      total: templates.total,
-      limit: templates.limit,
-      pages: templates.pages
+    return createSuccessResponse("ExperienceTemplates retrieved successfully", {
+      experienceTemplates: summarized,
+      total: experienceTemplates.total,
+      limit: experienceTemplates.limit,
+      pages: experienceTemplates.pages
     });
   }
-  return withErrorHandling(tool2, "Error listing templates");
+  return withErrorHandling(tool2, "Error listing experience templates");
 }
 
-// src/tools/exo/templates/createTemplate.ts
+// src/tools/exo/experience-templates/createExperienceTemplate.ts
 import { z as z100 } from "zod";
-var CreateTemplateToolParams = BaseToolSchema.extend({
-  name: z100.string().describe("The name of the template"),
-  description: z100.string().describe("Description of the template"),
-  viewports: z100.array(ViewportSchema).describe("Viewport definitions for the template (may be empty)"),
+var CreateExperienceTemplateToolParams = BaseToolSchema.extend({
+  name: z100.string().describe("The name of the experience template"),
+  description: z100.string().describe("Description of the experience template"),
+  viewports: z100.array(ViewportSchema).describe(
+    "Viewport definitions for the experience template (may be empty)"
+  ),
   contentProperties: z100.array(ContentPropertySchema).describe("Content property definitions (may be empty)"),
   designProperties: z100.array(DesignPropertySchema).describe("Design property definitions (may be empty)"),
   componentTree: z100.array(TreeNodeSchema).optional().describe("Optional component tree node definitions"),
@@ -6804,14 +6827,14 @@ var CreateTemplateToolParams = BaseToolSchema.extend({
     "Optional ExO metadata (tags, concepts)"
   )
 });
-function createTemplateTool(config) {
+function createExperienceTemplateTool(config) {
   async function tool2(args) {
     assertEnvironmentNotProtected(
       args.environmentId,
       config.protectedEnvironments
     );
     const contentfulClient = createToolClient(config, args);
-    const template = await contentfulClient.template.create(
+    const experienceTemplate = await contentfulClient.experienceTemplate.create(
       { spaceId: args.spaceId, environmentId: args.environmentId },
       {
         name: args.name,
@@ -6824,22 +6847,22 @@ function createTemplateTool(config) {
         ...args.metadata && { metadata: args.metadata }
       }
     );
-    return createSuccessResponse("Template created successfully", {
-      template
+    return createSuccessResponse("Experience template created successfully", {
+      experienceTemplate
     });
   }
-  return withErrorHandling(tool2, "Error creating template");
+  return withErrorHandling(tool2, "Error creating experience template");
 }
 
-// src/tools/exo/templates/upsertTemplate.ts
+// src/tools/exo/experience-templates/upsertExperienceTemplate.ts
 import { z as z101 } from "zod";
-var UpsertTemplateToolParams = BaseToolSchema.extend({
-  templateId: z101.string().describe("The ID of the template to update"),
+var UpsertExperienceTemplateToolParams = BaseToolSchema.extend({
+  experienceTemplateId: z101.string().describe("The ID of the experience template to update"),
   version: z101.number().describe(
-    "REQUIRED. The template's sys.version as returned by get_template. You must call get_template first to read the current state and version. The update is rejected if this does not match the current version, which means the template changed since you read it."
+    "REQUIRED. The experience template's sys.version as returned by get_experience_template. You must call get_experience_template first to read the current state and version. The update is rejected if this does not match the current version, which means the experience template changed since you read it."
   ),
-  name: z101.string().optional().describe("The name of the template"),
-  description: z101.string().optional().describe("Description of the template"),
+  name: z101.string().optional().describe("The name of the experience template"),
+  description: z101.string().optional().describe("Description of the experience template"),
   viewports: z101.array(ViewportSchema).optional().describe("Viewport definitions; replaces existing viewports if provided"),
   contentProperties: z101.array(ContentPropertySchema).optional().describe("Content property definitions; replaces existing if provided"),
   designProperties: z101.array(DesignPropertySchema).optional().describe("Design property definitions; replaces existing if provided"),
@@ -6849,7 +6872,7 @@ var UpsertTemplateToolParams = BaseToolSchema.extend({
     "ExO metadata (tags, concepts); replaces existing if provided"
   )
 });
-function upsertTemplateTool(config) {
+function upsertExperienceTemplateTool(config) {
   async function tool2(args) {
     assertEnvironmentNotProtected(
       args.environmentId,
@@ -6858,42 +6881,45 @@ function upsertTemplateTool(config) {
     const params = {
       spaceId: args.spaceId,
       environmentId: args.environmentId,
-      templateId: args.templateId
+      experienceTemplateId: args.experienceTemplateId
     };
     const contentfulClient = createToolClient(config, args);
-    const current = await contentfulClient.template.get(params);
+    const current = await contentfulClient.experienceTemplate.get(params);
     if (args.version !== current.sys.version) {
       throw new Error(
-        `Version conflict: the template has changed since you read it (your version: ${args.version}, current version: ${current.sys.version}). Re-fetch the template with get_template and retry the update with the latest sys.version.`
+        `Version conflict: the experience template has changed since you read it (your version: ${args.version}, current version: ${current.sys.version}). Re-fetch the experience template with get_experience_template and retry the update with the latest sys.version.`
       );
     }
-    const template = await contentfulClient.template.upsert(params, {
-      sys: {
-        id: current.sys.id,
-        type: "Template",
-        version: current.sys.version
-      },
-      name: args.name ?? current.name,
-      description: args.description ?? current.description,
-      viewports: args.viewports ?? current.viewports,
-      contentProperties: args.contentProperties ?? current.contentProperties,
-      designProperties: args.designProperties ?? current.designProperties,
-      ...args.componentTree ?? current.componentTree ? { componentTree: args.componentTree ?? current.componentTree } : {},
-      ...args.slots ?? current.slots ? { slots: args.slots ?? current.slots } : {},
-      ...args.metadata ?? current.metadata ? { metadata: args.metadata ?? current.metadata } : {},
-      ...current.dataAssemblies ? { dataAssemblies: current.dataAssemblies } : {}
-    });
-    return createSuccessResponse("Template updated successfully", {
-      template
+    const experienceTemplate = await contentfulClient.experienceTemplate.upsert(
+      params,
+      {
+        sys: {
+          id: current.sys.id,
+          type: "ExperienceTemplate",
+          version: current.sys.version
+        },
+        name: args.name ?? current.name,
+        description: args.description ?? current.description,
+        viewports: args.viewports ?? current.viewports,
+        contentProperties: args.contentProperties ?? current.contentProperties,
+        designProperties: args.designProperties ?? current.designProperties,
+        ...args.componentTree ?? current.componentTree ? { componentTree: args.componentTree ?? current.componentTree } : {},
+        ...args.slots ?? current.slots ? { slots: args.slots ?? current.slots } : {},
+        ...args.metadata ?? current.metadata ? { metadata: args.metadata ?? current.metadata } : {},
+        ...current.dataAssemblies ? { dataAssemblies: current.dataAssemblies } : {}
+      }
+    );
+    return createSuccessResponse("Experience template updated successfully", {
+      experienceTemplate
     });
   }
-  return withErrorHandling(tool2, "Error updating template");
+  return withErrorHandling(tool2, "Error updating experience template");
 }
 
-// src/tools/exo/templates/deleteTemplate.ts
+// src/tools/exo/experience-templates/deleteExperienceTemplate.ts
 import { z as z102 } from "zod";
-var DeleteTemplateToolParams = BaseToolSchema.extend({
-  templateId: z102.string().describe("The ID of the template to delete"),
+var DeleteExperienceTemplateToolParams = BaseToolSchema.extend({
+  experienceTemplateId: z102.string().describe("The ID of the experience template to delete"),
   confirm: z102.boolean().optional().describe(
     "Set to true on the second call to actually perform the deletion. Required together with confirmToken."
   ),
@@ -6901,7 +6927,7 @@ var DeleteTemplateToolParams = BaseToolSchema.extend({
     "Token returned by the preview call; must be supplied with confirm: true."
   )
 });
-function deleteTemplateTool(config) {
+function deleteExperienceTemplateTool(config) {
   async function tool2(args) {
     assertEnvironmentNotProtected(
       args.environmentId,
@@ -6910,43 +6936,43 @@ function deleteTemplateTool(config) {
     const params = {
       spaceId: args.spaceId,
       environmentId: args.environmentId,
-      templateId: args.templateId
+      experienceTemplateId: args.experienceTemplateId
     };
     const contentfulClient = createToolClient(config, args);
-    const template = await contentfulClient.template.get(params);
+    const experienceTemplate = await contentfulClient.experienceTemplate.get(params);
     const expectedToken = buildConfirmToken(
-      "template",
-      args.templateId,
-      template.sys.version
+      "experienceTemplate",
+      args.experienceTemplateId,
+      experienceTemplate.sys.version
     );
     if (args.confirm !== true || args.confirmToken !== expectedToken) {
       return createSuccessResponse(
-        `${CONFIRMATION_MESSAGE_PREFIX} template`,
+        `${CONFIRMATION_MESSAGE_PREFIX} experience template`,
         buildConfirmationPreview(
-          "template",
-          args.templateId,
-          { template },
+          "experienceTemplate",
+          args.experienceTemplateId,
+          { experienceTemplate },
           expectedToken
         )
       );
     }
-    await contentfulClient.template.delete(params);
-    return createSuccessResponse("Template deleted successfully", {
-      templateId: args.templateId
+    await contentfulClient.experienceTemplate.delete(params);
+    return createSuccessResponse("Experience template deleted successfully", {
+      experienceTemplateId: args.experienceTemplateId
     });
   }
-  return withErrorHandling(tool2, "Error deleting template");
+  return withErrorHandling(tool2, "Error deleting experience template");
 }
 
-// src/tools/exo/templates/publishTemplate.ts
+// src/tools/exo/experience-templates/publishExperienceTemplate.ts
 import { z as z103 } from "zod";
-var PublishTemplateToolParams = BaseToolSchema.extend({
-  templateId: z103.string().describe("The ID of the template to publish"),
+var PublishExperienceTemplateToolParams = BaseToolSchema.extend({
+  experienceTemplateId: z103.string().describe("The ID of the experience template to publish"),
   version: z103.number().describe(
-    "REQUIRED. The template's sys.version as returned by get_template. You must call get_template first to read the current state and version. The publish is rejected if this does not match the current version, which means the template changed since you read it."
+    "REQUIRED. The experience template's sys.version as returned by get_experience_template. You must call get_experience_template first to read the current state and version. The publish is rejected if this does not match the current version, which means the experience template changed since you read it."
   )
 });
-function publishTemplateTool(config) {
+function publishExperienceTemplateTool(config) {
   async function tool2(args) {
     assertEnvironmentNotProtected(
       args.environmentId,
@@ -6955,35 +6981,35 @@ function publishTemplateTool(config) {
     const params = {
       spaceId: args.spaceId,
       environmentId: args.environmentId,
-      templateId: args.templateId
+      experienceTemplateId: args.experienceTemplateId
     };
     const contentfulClient = createToolClient(config, args);
-    const current = await contentfulClient.template.get(params);
+    const current = await contentfulClient.experienceTemplate.get(params);
     if (args.version !== current.sys.version) {
       throw new Error(
-        `Version conflict: the template has changed since you read it (your version: ${args.version}, current version: ${current.sys.version}). Re-fetch the template with get_template and retry with the latest sys.version.`
+        `Version conflict: the experience template has changed since you read it (your version: ${args.version}, current version: ${current.sys.version}). Re-fetch the experience template with get_experience_template and retry with the latest sys.version.`
       );
     }
-    const template = await contentfulClient.template.publish({
+    const experienceTemplate = await contentfulClient.experienceTemplate.publish({
       ...params,
       version: args.version
     });
-    return createSuccessResponse("Template published successfully", {
-      template
+    return createSuccessResponse("Experience template published successfully", {
+      experienceTemplate
     });
   }
-  return withErrorHandling(tool2, "Error publishing template");
+  return withErrorHandling(tool2, "Error publishing experience template");
 }
 
-// src/tools/exo/templates/unpublishTemplate.ts
+// src/tools/exo/experience-templates/unpublishExperienceTemplate.ts
 import { z as z104 } from "zod";
-var UnpublishTemplateToolParams = BaseToolSchema.extend({
-  templateId: z104.string().describe("The ID of the template to unpublish"),
+var UnpublishExperienceTemplateToolParams = BaseToolSchema.extend({
+  experienceTemplateId: z104.string().describe("The ID of the experience template to unpublish"),
   version: z104.number().describe(
-    "REQUIRED. The template's sys.version as returned by get_template. You must call get_template first to read the current state and version. The unpublish is rejected if this does not match the current version, which means the template changed since you read it."
+    "REQUIRED. The experience template's sys.version as returned by get_experience_template. You must call get_experience_template first to read the current state and version. The unpublish is rejected if this does not match the current version, which means the experience template changed since you read it."
   )
 });
-function unpublishTemplateTool(config) {
+function unpublishExperienceTemplateTool(config) {
   async function tool2(args) {
     assertEnvironmentNotProtected(
       args.environmentId,
@@ -6992,117 +7018,120 @@ function unpublishTemplateTool(config) {
     const params = {
       spaceId: args.spaceId,
       environmentId: args.environmentId,
-      templateId: args.templateId
+      experienceTemplateId: args.experienceTemplateId
     };
     const contentfulClient = createToolClient(config, args);
-    const current = await contentfulClient.template.get(params);
+    const current = await contentfulClient.experienceTemplate.get(params);
     if (args.version !== current.sys.version) {
       throw new Error(
-        `Version conflict: the template has changed since you read it (your version: ${args.version}, current version: ${current.sys.version}). Re-fetch the template with get_template and retry with the latest sys.version.`
+        `Version conflict: the experience template has changed since you read it (your version: ${args.version}, current version: ${current.sys.version}). Re-fetch the experience template with get_experience_template and retry with the latest sys.version.`
       );
     }
-    const template = await contentfulClient.template.unpublish({
+    const experienceTemplate = await contentfulClient.experienceTemplate.unpublish({
       ...params,
       version: args.version
     });
-    return createSuccessResponse("Template unpublished successfully", {
-      template
-    });
+    return createSuccessResponse(
+      "Experience template unpublished successfully",
+      {
+        experienceTemplate
+      }
+    );
   }
-  return withErrorHandling(tool2, "Error unpublishing template");
+  return withErrorHandling(tool2, "Error unpublishing experience template");
 }
 
-// src/tools/exo/templates/register.ts
-function createTemplateTools(config) {
-  const getTemplate = getTemplateTool(config);
-  const listTemplates = listTemplatesTool(config);
-  const createTemplate = createTemplateTool(config);
-  const upsertTemplate = upsertTemplateTool(config);
-  const deleteTemplate = deleteTemplateTool(config);
-  const publishTemplate = publishTemplateTool(config);
-  const unpublishTemplate = unpublishTemplateTool(config);
+// src/tools/exo/experience-templates/register.ts
+function createExperienceTemplateTools(config) {
+  const getExperienceTemplate = getExperienceTemplateTool(config);
+  const listExperienceTemplates = listExperienceTemplatesTool(config);
+  const createExperienceTemplate = createExperienceTemplateTool(config);
+  const upsertExperienceTemplate = upsertExperienceTemplateTool(config);
+  const deleteExperienceTemplate = deleteExperienceTemplateTool(config);
+  const publishExperienceTemplate = publishExperienceTemplateTool(config);
+  const unpublishExperienceTemplate = unpublishExperienceTemplateTool(config);
   return {
-    getTemplate: {
-      title: "get_template",
-      description: "Get details about a specific ExO template (a layout definition that backs template-based Experiences).",
-      inputParams: GetTemplateToolParams.shape,
+    getExperienceTemplate: {
+      title: "get_experience_template",
+      description: "Get details about a specific ExO experience template (a layout definition that backs experience-template-based Experiences).",
+      inputParams: GetExperienceTemplateToolParams.shape,
       annotations: {
         readOnlyHint: true,
         destructiveHint: false,
         openWorldHint: false
       },
-      tool: getTemplate
+      tool: getExperienceTemplate
     },
-    listTemplates: {
-      title: "list_templates",
-      description: "List ExO templates in a space and environment. Returns a maximum of 10 items per request; use the pageNext cursor (returned in pages.next) to paginate.",
-      inputParams: ListTemplatesToolParams.shape,
+    listExperienceTemplates: {
+      title: "list_experience_templates",
+      description: "List ExO experience templates in a space and environment. Returns a maximum of 10 items per request; use the pageNext cursor (returned in pages.next) to paginate.",
+      inputParams: ListExperienceTemplatesToolParams.shape,
       annotations: {
         readOnlyHint: true,
         destructiveHint: false,
         openWorldHint: false
       },
-      tool: listTemplates
+      tool: listExperienceTemplates
     },
-    createTemplate: {
-      title: "create_template",
-      description: "Create a new ExO template.",
-      inputParams: CreateTemplateToolParams.shape,
+    createExperienceTemplate: {
+      title: "create_experience_template",
+      description: "Create a new ExO experience template.",
+      inputParams: CreateExperienceTemplateToolParams.shape,
       annotations: {
         readOnlyHint: false,
         destructiveHint: false,
         idempotentHint: false,
         openWorldHint: false
       },
-      tool: createTemplate
+      tool: createExperienceTemplate
     },
-    upsertTemplate: {
-      title: "upsert_template",
-      description: "Update an existing ExO template. You MUST call get_template first to read the current state, then pass the sys.version you received as the version parameter. The handler merges your updates with the existing template fields, so you only need to provide the fields you want to change. If the version is stale (the template changed since you read it), the update is rejected and you must re-fetch with get_template.",
-      inputParams: UpsertTemplateToolParams.shape,
+    upsertExperienceTemplate: {
+      title: "upsert_experience_template",
+      description: "Update an existing ExO experience template. You MUST call get_experience_template first to read the current state, then pass the sys.version you received as the version parameter. The handler merges your updates with the existing experience template fields, so you only need to provide the fields you want to change. If the version is stale (the experience template changed since you read it), the update is rejected and you must re-fetch with get_experience_template.",
+      inputParams: UpsertExperienceTemplateToolParams.shape,
       annotations: {
         readOnlyHint: false,
         destructiveHint: false,
         idempotentHint: false,
         openWorldHint: false
       },
-      tool: upsertTemplate
+      tool: upsertExperienceTemplate
     },
-    deleteTemplate: {
-      title: "delete_template",
-      description: "Delete an ExO template. Two-phase: the first call (without confirm/confirmToken) returns a preview and a confirmToken. To complete the deletion, call again with the same templateId, confirm: true, and the confirmToken from the preview.",
-      inputParams: DeleteTemplateToolParams.shape,
+    deleteExperienceTemplate: {
+      title: "delete_experience_template",
+      description: "Delete an ExO experience template. Two-phase: the first call (without confirm/confirmToken) returns a preview and a confirmToken. To complete the deletion, call again with the same experienceTemplateId, confirm: true, and the confirmToken from the preview.",
+      inputParams: DeleteExperienceTemplateToolParams.shape,
       annotations: {
         readOnlyHint: false,
         destructiveHint: true,
         idempotentHint: false,
         openWorldHint: false
       },
-      tool: deleteTemplate
+      tool: deleteExperienceTemplate
     },
-    publishTemplate: {
-      title: "publish_template",
-      description: "Publish an ExO template. You MUST call get_template first and pass the returned sys.version as the version parameter. If the version is stale the operation is rejected and you must re-fetch with get_template.",
-      inputParams: PublishTemplateToolParams.shape,
+    publishExperienceTemplate: {
+      title: "publish_experience_template",
+      description: "Publish an ExO experience template. You MUST call get_experience_template first and pass the returned sys.version as the version parameter. If the version is stale the operation is rejected and you must re-fetch with get_experience_template.",
+      inputParams: PublishExperienceTemplateToolParams.shape,
       annotations: {
         readOnlyHint: false,
         destructiveHint: true,
         idempotentHint: true,
         openWorldHint: false
       },
-      tool: publishTemplate
+      tool: publishExperienceTemplate
     },
-    unpublishTemplate: {
-      title: "unpublish_template",
-      description: "Unpublish an ExO template. You MUST call get_template first and pass the returned sys.version as the version parameter. If the version is stale the operation is rejected and you must re-fetch with get_template.",
-      inputParams: UnpublishTemplateToolParams.shape,
+    unpublishExperienceTemplate: {
+      title: "unpublish_experience_template",
+      description: "Unpublish an ExO experience template. You MUST call get_experience_template first and pass the returned sys.version as the version parameter. If the version is stale the operation is rejected and you must re-fetch with get_experience_template.",
+      inputParams: UnpublishExperienceTemplateToolParams.shape,
       annotations: {
         readOnlyHint: false,
         destructiveHint: true,
         idempotentHint: true,
         openWorldHint: false
       },
-      tool: unpublishTemplate
+      tool: unpublishExperienceTemplate
     }
   };
 }
@@ -7164,18 +7193,11 @@ function listExperiencesTool(config) {
 
 // src/tools/exo/experiences/createExperience.ts
 import { z as z107 } from "zod";
-var TemplateResourceLinkSchema = z107.object({
-  sys: z107.object({
-    type: z107.literal("ResourceLink"),
-    linkType: z107.literal("Contentful:Template"),
-    urn: z107.string().describe("URN of the linked resource")
-  })
-});
 var CreateExperienceToolParams = BaseToolSchema.extend({
   name: z107.string().describe("The name of the experience"),
   description: z107.string().describe("Description of the experience"),
-  template: TemplateResourceLinkSchema.describe(
-    "Resource link to the Template this experience is backed by"
+  experienceTemplate: ExperienceTemplateResourceLinkSchema.describe(
+    "Resource link to the ExperienceTemplate this experience is backed by"
   ),
   viewports: z107.array(ViewportSchema).describe("Viewport definitions for the experience (may be empty)"),
   designProperties: z107.record(z107.string(), DimensionedDesignPropertyValueSchema).describe(
@@ -7185,7 +7207,7 @@ var CreateExperienceToolParams = BaseToolSchema.extend({
     "Optional content bindings linking this experience to a data assembly"
   ),
   slots: z107.record(z107.string(), z107.array(ExperienceSlotNodeSchema)).optional().describe(
-    "Optional slot contents keyed by slot ID. Each value is an array of FragmentNode or InlineFragmentNode."
+    "Optional slot contents keyed by slot ID. Each value is an array of ExperienceFragmentNode or InlineExperienceFragmentNode."
   ),
   metadata: ExperienceMetadataSchema.optional().describe(
     "Optional ExO metadata (tags, concepts)"
@@ -7203,7 +7225,7 @@ function createExperienceTool(config) {
       {
         name: args.name,
         description: args.description,
-        template: args.template,
+        experienceTemplate: args.experienceTemplate,
         viewports: args.viewports,
         designProperties: args.designProperties,
         ...args.contentBindings && { contentBindings: args.contentBindings },
@@ -7234,9 +7256,7 @@ var UpsertExperienceToolParams = BaseToolSchema.extend({
   contentBindings: ExperienceContentBindingsSchema.optional().describe(
     "Content bindings linking this experience to a data assembly; replaces existing if provided"
   ),
-  slots: z108.record(z108.string(), z108.array(ExperienceSlotNodeSchema)).optional().describe(
-    "Slot contents keyed by slot ID; replaces existing if provided"
-  ),
+  slots: z108.record(z108.string(), z108.array(ExperienceSlotNodeSchema)).optional().describe("Slot contents keyed by slot ID; replaces existing if provided"),
   metadata: ExperienceMetadataSchema.optional().describe(
     "ExO metadata (tags, concepts); replaces existing if provided"
   )
@@ -7414,7 +7434,7 @@ function createExperienceTools(config) {
   return {
     getExperience: {
       title: "get_experience",
-      description: "Get details about a specific ExO experience (a concrete page or screen that composes a root ComponentType with content and design settings, backed by a Template).",
+      description: "Get details about a specific ExO experience (a concrete page or screen that composes a root Component with content and design settings, backed by an ExperienceTemplate).",
       inputParams: GetExperienceToolParams.shape,
       annotations: {
         readOnlyHint: true,
@@ -7436,7 +7456,7 @@ function createExperienceTools(config) {
     },
     createExperience: {
       title: "create_experience",
-      description: "Create a new ExO experience backed by a Template.",
+      description: "Create a new ExO experience backed by an ExperienceTemplate.",
       inputParams: CreateExperienceToolParams.shape,
       annotations: {
         readOnlyHint: false,
@@ -8106,16 +8126,16 @@ var ContentfulMcpTools = class {
     return createContentTypeTools(this.config);
   }
   /**
-   * Get ExO component type tools
+   * Get ExO component tools
    */
-  getComponentTypeTools() {
-    return createComponentTypeTools(this.config);
+  getComponentTools() {
+    return createComponentTools(this.config);
   }
   /**
-   * Get ExO template tools
+   * Get ExO experience template tools
    */
-  getTemplateTools() {
-    return createTemplateTools(this.config);
+  getExperienceTemplateTools() {
+    return createExperienceTemplateTools(this.config);
   }
   /**
    * Get ExO experience tools
@@ -8178,10 +8198,10 @@ var ContentfulMcpTools = class {
     return createTaxonomyTools(this.config);
   }
   /**
-   * Get ExO fragment tools
+   * Get ExO experience fragment tools
    */
-  getFragmentTools() {
-    return createFragmentTools(this.config);
+  getExperienceFragmentTools() {
+    return createExperienceFragmentTools(this.config);
   }
   /**
    * Get ExO data assembly tools