diff --git a/app/app.vue b/app/app.vue
index f7016e3..6ca6bc8 100644
--- a/app/app.vue
+++ b/app/app.vue
@@ -130,7 +130,8 @@
                 @keydown.enter.prevent="toggleDropdown('component-mobile')"
                 @keydown.space.prevent="toggleDropdown('component-mobile')"
                 :class="
-                  isActive('/component-category') || isActive('/component-catalog')
+                  isActive('/component-category') ||
+                  isActive('/component-catalog')
                     ? 'bg-primary text-primary-content font-semibold shadow-sm'
                     : 'text-base-content hover:bg-primary/10 hover:text-primary'
                 "
@@ -303,38 +304,25 @@
             @focusin="setDropdown('pieces-desktop')"
             @focusout="scheduleDropdownClose('pieces-desktop')"
           >
-          <div
-            tabindex="0"
-            role="button"
-            class="transition-colors px-3 py-2 rounded-md inline-flex items-center gap-1 cursor-pointer"
-            @click="toggleDropdown('pieces-desktop')"
-            @keydown.enter.prevent="toggleDropdown('pieces-desktop')"
-            @keydown.space.prevent="toggleDropdown('pieces-desktop')"
-            :class="
-              isActive('/piece-category') || isActive('/pieces-catalog')
-                ? 'bg-primary text-primary-content font-semibold shadow-sm'
-                : 'text-base-content hover:bg-primary/10 hover:text-primary'
-            "
-          >
-            Pièces
-          </div>
+            <div
+              tabindex="0"
+              role="button"
+              class="transition-colors px-3 py-2 rounded-md inline-flex items-center gap-1 cursor-pointer"
+              @click="toggleDropdown('pieces-desktop')"
+              @keydown.enter.prevent="toggleDropdown('pieces-desktop')"
+              @keydown.space.prevent="toggleDropdown('pieces-desktop')"
+              :class="
+                isActive('/piece-category') || isActive('/pieces-catalog')
+                  ? 'bg-primary text-primary-content font-semibold shadow-sm'
+                  : 'text-base-content hover:bg-primary/10 hover:text-primary'
+              "
+            >
+              Pièces
+            </div>
             <ul
               tabindex="0"
               class="dropdown-content z-[1] menu p-2 shadow bg-base-100 rounded-box w-60"
             >
-              <li>
-                <NuxtLink
-                  to="/pieces-catalog"
-                  class="rounded-md px-2 py-1 transition-colors"
-                  :class="
-                    isActive('/pieces-catalog')
-                      ? 'bg-primary/10 text-primary font-semibold'
-                      : 'text-base-content hover:bg-primary/10 hover:text-primary'
-                  "
-                >
-                  Catalogue des pièces
-                </NuxtLink>
-              </li>
               <li>
                 <NuxtLink
                   to="/piece-category"
@@ -348,6 +336,19 @@
                   Catégorie de pièce
                 </NuxtLink>
               </li>
+              <li>
+                <NuxtLink
+                  to="/pieces-catalog"
+                  class="rounded-md px-2 py-1 transition-colors"
+                  :class="
+                    isActive('/pieces-catalog')
+                      ? 'bg-primary/10 text-primary font-semibold'
+                      : 'text-base-content hover:bg-primary/10 hover:text-primary'
+                  "
+                >
+                  Catalogue des pièces
+                </NuxtLink>
+              </li>
             </ul>
           </li>
           <li
@@ -358,38 +359,26 @@
             @focusin="setDropdown('component-desktop')"
             @focusout="scheduleDropdownClose('component-desktop')"
           >
-          <div
-            tabindex="0"
-            role="button"
-            class="transition-colors px-3 py-2 rounded-md inline-flex items-center gap-1 cursor-pointer"
-            @click="toggleDropdown('component-desktop')"
-            @keydown.enter.prevent="toggleDropdown('component-desktop')"
-            @keydown.space.prevent="toggleDropdown('component-desktop')"
-            :class="
-              isActive('/component-category') || isActive('/component-catalog')
-                ? 'bg-primary text-primary-content font-semibold shadow-sm'
-                : 'text-base-content hover:bg-primary/10 hover:text-primary'
-            "
-          >
-            Composant
-          </div>
+            <div
+              tabindex="0"
+              role="button"
+              class="transition-colors px-3 py-2 rounded-md inline-flex items-center gap-1 cursor-pointer"
+              @click="toggleDropdown('component-desktop')"
+              @keydown.enter.prevent="toggleDropdown('component-desktop')"
+              @keydown.space.prevent="toggleDropdown('component-desktop')"
+              :class="
+                isActive('/component-category') ||
+                isActive('/component-catalog')
+                  ? 'bg-primary text-primary-content font-semibold shadow-sm'
+                  : 'text-base-content hover:bg-primary/10 hover:text-primary'
+              "
+            >
+              Composant
+            </div>
             <ul
               tabindex="0"
               class="dropdown-content z-[1] menu p-2 shadow bg-base-100 rounded-box w-64"
             >
-              <li>
-                <NuxtLink
-                  to="/component-catalog"
-                  class="rounded-md px-2 py-1 transition-colors"
-                  :class="
-                    isActive('/component-catalog')
-                      ? 'bg-primary/10 text-primary font-semibold'
-                      : 'text-base-content hover:bg-primary/10 hover:text-primary'
-                  "
-                >
-                  Catalogue des composants
-                </NuxtLink>
-              </li>
               <li>
                 <NuxtLink
                   to="/component-category"
@@ -403,6 +392,19 @@
                   Catégorie de composant
                 </NuxtLink>
               </li>
+              <li>
+                <NuxtLink
+                  to="/component-catalog"
+                  class="rounded-md px-2 py-1 transition-colors"
+                  :class="
+                    isActive('/component-catalog')
+                      ? 'bg-primary/10 text-primary font-semibold'
+                      : 'text-base-content hover:bg-primary/10 hover:text-primary'
+                  "
+                >
+                  Catalogue des composants
+                </NuxtLink>
+              </li>
             </ul>
           </li>
           <li
@@ -413,16 +415,16 @@
             @focusin="setDropdown('resources-desktop')"
             @focusout="scheduleDropdownClose('resources-desktop')"
           >
-          <div
-            tabindex="0"
-            role="button"
-            class="transition-colors px-3 py-2 rounded-md inline-flex items-center gap-1 cursor-pointer"
-            @click="toggleDropdown('resources-desktop')"
-            @keydown.enter.prevent="toggleDropdown('resources-desktop')"
-            @keydown.space.prevent="toggleDropdown('resources-desktop')"
-            :class="
-              isActive('/sites') ||
-              isActive('/documents') ||
+            <div
+              tabindex="0"
+              role="button"
+              class="transition-colors px-3 py-2 rounded-md inline-flex items-center gap-1 cursor-pointer"
+              @click="toggleDropdown('resources-desktop')"
+              @keydown.enter.prevent="toggleDropdown('resources-desktop')"
+              @keydown.space.prevent="toggleDropdown('resources-desktop')"
+              :class="
+                isActive('/sites') ||
+                isActive('/documents') ||
                 isActive('/constructeurs')
                   ? 'bg-primary text-primary-content font-semibold shadow-sm'
                   : 'text-base-content hover:bg-primary/10 hover:text-primary'
diff --git a/app/components/ConstructeurSelect.vue b/app/components/ConstructeurSelect.vue
index 3314200..c9ea3dc 100644
--- a/app/components/ConstructeurSelect.vue
+++ b/app/components/ConstructeurSelect.vue
@@ -170,7 +170,7 @@ watch(
   { immediate: true }
 )
 
-const ensureOptionsLoaded = async (force = false) => {
+async function ensureOptionsLoaded (force = false) {
   if (!force && !searchTerm.value && constructeurs.value.length) {
     applyOptions(constructeurs.value)
     return
diff --git a/app/pages/component-catalog.vue b/app/pages/component-catalog.vue
index 38e71e2..76b9b44 100644
--- a/app/pages/component-catalog.vue
+++ b/app/pages/component-catalog.vue
@@ -4,406 +4,76 @@
       <div>
         <h1 class="text-3xl font-semibold text-base-content">Catalogue des composants</h1>
         <p class="text-sm text-gray-500">
-          Consultez les catégories disponibles et instanciez des composants à partir de leur squelette canonique.
+          Consultez et gérez tous les composants existants.
         </p>
       </div>
-      <NuxtLink to="/component-category" class="btn btn-outline btn-sm md:btn-md self-start">
-        Gérer les catégories
-      </NuxtLink>
+      <div class="flex flex-wrap gap-2">
+        <NuxtLink to="/component/create" class="btn btn-primary btn-sm md:btn-md">
+          Ajouter un composant
+        </NuxtLink>
+        <NuxtLink to="/component-category" class="btn btn-outline btn-sm md:btn-md">
+          Gérer les catégories
+        </NuxtLink>
+      </div>
     </header>
 
-    <section>
-      <div v-if="loadingTypes" class="flex justify-center py-16">
-        <span class="loading loading-spinner loading-lg" aria-hidden="true" />
-      </div>
+    <section class="card border border-base-200 bg-base-100 shadow-sm">
+      <div class="card-body space-y-4">
+        <header class="flex flex-col gap-2">
+          <h2 class="text-xl font-semibold text-base-content">Composants créés</h2>
+          <p class="text-sm text-base-content/70">
+            Retrouvez ici tous les composants enregistrés, indépendamment de leur catégorie.
+          </p>
+        </header>
 
-      <template v-else>
-        <p v-if="!componentTypeList.length" class="text-sm text-gray-500">
-          Aucune catégorie de composant n'est disponible pour le moment. Créez des catégories dans la gestion dédiée pour définir
-          vos squelettes.
+        <div v-if="loadingComposants" class="flex justify-center py-8">
+          <span class="loading loading-spinner" aria-hidden="true" />
+        </div>
+
+        <p v-else-if="!composantsList.length" class="text-sm text-base-content/70">
+          Aucun composant n'a encore été créé.
         </p>
 
-        <div v-else class="grid gap-6 lg:grid-cols-2">
-          <article
-            v-for="type in componentTypeList"
-            :key="type.id"
-            class="card bg-base-100 border border-base-200 shadow-sm"
-          >
-            <div class="card-body space-y-4">
-              <div class="flex flex-col gap-3 md:flex-row md:items-start md:justify-between">
-                <div class="space-y-1">
-                  <h2 class="card-title text-xl">{{ type.name }}</h2>
-                  <p v-if="type.description" class="text-sm text-gray-500">
-                    {{ type.description }}
-                  </p>
-                </div>
-
-                <button type="button" class="btn btn-primary btn-sm md:btn-md self-start" @click="openCreationModal(type)">
-                  Instancier un composant
-                </button>
-              </div>
-
-              <div class="flex flex-wrap gap-2 text-xs text-gray-500">
-                <span class="badge badge-outline">{{ formatStructurePreview(type.structure) }}</span>
-                <span v-if="getCategoryCustomFields(type).length" class="badge badge-outline">
-                  {{ getCategoryCustomFields(type).length }} champ(s) personnalisés
-                </span>
-              </div>
-
-              <div v-if="type.structure" class="space-y-3">
-                <details class="collapse collapse-arrow bg-base-200/60">
-                  <summary class="collapse-title text-sm font-medium">
-                    Détails du squelette
-                  </summary>
-                  <div class="collapse-content space-y-3 text-sm text-base-content/80">
-                    <div v-if="getStructureCustomFields(type.structure).length" class="space-y-1">
-                      <h3 class="font-semibold text-sm text-base-content">Valeurs par défaut</h3>
-                      <ul class="list-disc list-inside space-y-1">
-                        <li
-                          v-for="field in getStructureCustomFields(type.structure)"
-                          :key="field.key || field.name"
-                        >
-                          <span class="font-medium">{{ field.key || field.name }}</span>
-                          <span v-if="field.value !== undefined && field.value !== null"> : {{ field.value }}</span>
-                        </li>
-                      </ul>
-                    </div>
-
-                    <div v-if="getStructurePieces(type.structure).length" class="space-y-1">
-                      <h3 class="font-semibold text-sm text-base-content">Pièces imposées</h3>
-                      <ul class="list-disc list-inside space-y-1">
-                        <li
-                          v-for="(piece, index) in getStructurePieces(type.structure)"
-                          :key="piece.role || piece.typePieceId || piece.familyCode || index"
-                        >
-                          {{ resolvePieceLabel(piece) }}
-                        </li>
-                      </ul>
-                    </div>
-
-                    <div v-if="getStructureSubcomponents(type.structure).length" class="space-y-1">
-                      <h3 class="font-semibold text-sm text-base-content">Sous-composants</h3>
-                      <ul class="list-disc list-inside space-y-1">
-                        <li
-                          v-for="(subcomponent, index) in getStructureSubcomponents(type.structure)"
-                          :key="subcomponent.alias || subcomponent.typeComposantId || subcomponent.familyCode || index"
-                        >
-                          {{ resolveSubcomponentLabel(subcomponent) }}
-                        </li>
-                      </ul>
-                    </div>
-
-                    <p
-                      v-if="!getStructureCustomFields(type.structure).length && !getStructurePieces(type.structure).length && !getStructureSubcomponents(type.structure).length"
-                      class="text-xs text-gray-500"
-                    >
-                      Ce squelette ne définit pas encore de pièces, sous-composants ou valeurs par défaut.
-                    </p>
-                  </div>
-                </details>
-              </div>
-
-              <div v-if="getCategoryCustomFields(type).length" class="space-y-2">
-                <h3 class="text-sm font-semibold text-base-content">Champs personnalisés de la catégorie</h3>
-                <ul class="space-y-1 text-sm text-base-content/80">
-                  <li
-                    v-for="field in getCategoryCustomFields(type)"
-                    :key="field.id || field.name"
-                    class="flex flex-wrap gap-2 items-center"
+        <div v-else class="overflow-x-auto">
+          <table class="table table-sm md:table-md">
+            <thead>
+              <tr>
+                <th>Nom</th>
+                <th>Catégorie</th>
+                <th>Référence</th>
+                <th>Actions</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="component in composantsList" :key="component.id">
+                <td>{{ component.name || 'Composant sans nom' }}</td>
+                <td>{{ component.typeComposant?.name || '—' }}</td>
+                <td>{{ component.reference || '—' }}</td>
+                <td>
+                  <NuxtLink
+                    :to="`/component/${component.id}/edit`"
+                    class="btn btn-ghost btn-xs"
                   >
-                    <span class="font-medium">{{ field.name }}</span>
-                    <span class="badge badge-outline badge-xs">{{ field.type || 'text' }}</span>
-                    <span v-if="field.required" class="badge badge-outline badge-xs badge-error">Obligatoire</span>
-                  </li>
-                </ul>
-              </div>
-
-              <div v-if="getExistingComponents(type).length" class="space-y-2">
-                <h3 class="text-sm font-semibold text-base-content">Composants existants</h3>
-                <ul class="space-y-1 text-sm text-base-content/80">
-                  <li
-                    v-for="component in getExistingComponents(type).slice(0, 5)"
-                    :key="component.id"
-                  >
-                    <span class="font-medium">{{ component.name || 'Composant sans nom' }}</span>
-                    <span v-if="component.machine?.name" class="text-xs text-gray-500">
-                      · Machine : {{ component.machine.name }}
-                    </span>
-                  </li>
-                </ul>
-                <p
-                  v-if="getExistingComponents(type).length > 5"
-                  class="text-xs text-gray-500"
-                >
-                  + {{ getExistingComponents(type).length - 5 }} composant(s) supplémentaires.
-                </p>
-              </div>
-            </div>
-          </article>
+                    Modifier
+                  </NuxtLink>
+                </td>
+              </tr>
+            </tbody>
+          </table>
         </div>
-      </template>
+      </div>
     </section>
   </main>
 
-  <Teleport to="body">
-    <div v-if="creationModalOpen" class="modal modal-open">
-      <div class="modal-box max-w-3xl space-y-6">
-        <div class="space-y-1">
-          <h3 class="text-lg font-semibold">
-            Instancier un composant
-          </h3>
-          <p class="text-sm text-gray-500">
-            Renseignez les informations du composant instancié à partir du squelette de la catégorie sélectionnée.
-          </p>
-          <p v-if="selectedType" class="badge badge-outline badge-sm">
-            Catégorie : {{ selectedType.name }}
-          </p>
-        </div>
-
-        <form class="space-y-4" @submit.prevent="submitCreation">
-          <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-            <div class="form-control">
-              <label class="label">
-                <span class="label-text">Nom du composant</span>
-              </label>
-              <input
-                v-model="creationForm.name"
-                type="text"
-                class="input input-bordered input-sm md:input-md"
-                :disabled="submitting"
-                placeholder="Nom affiché après instanciation"
-              >
-            </div>
-
-            <div class="form-control">
-              <label class="label">
-                <span class="label-text">Référence</span>
-              </label>
-              <input
-                v-model="creationForm.reference"
-                type="text"
-                class="input input-bordered input-sm md:input-md"
-                :disabled="submitting"
-                placeholder="Référence interne ou constructeur"
-              >
-            </div>
-
-            <div class="form-control">
-              <label class="label">
-                <span class="label-text">Constructeur</span>
-              </label>
-              <ConstructeurSelect
-                v-model="creationForm.constructeurId"
-                class="w-full"
-                :disabled="submitting"
-                placeholder="Rechercher un constructeur..."
-              />
-            </div>
-
-            <div class="form-control">
-              <label class="label">
-                <span class="label-text">Prix</span>
-              </label>
-              <input
-                v-model="creationForm.prix"
-                type="number"
-                step="0.01"
-                min="0"
-                class="input input-bordered input-sm md:input-md"
-                :disabled="submitting"
-                placeholder="Valeur indicative (€)"
-              >
-            </div>
-          </div>
-        </form>
-
-        <div class="modal-action">
-          <button type="button" class="btn btn-ghost" :disabled="submitting" @click="closeCreationModal">
-            Annuler
-          </button>
-          <button
-            type="button"
-            class="btn btn-primary"
-            :disabled="!canSubmit"
-            @click="submitCreation"
-          >
-            <span v-if="submitting" class="loading loading-spinner loading-sm mr-2"></span>
-            Créer le composant
-          </button>
-        </div>
-      </div>
-      <button class="modal-backdrop" aria-label="Fermer" @click="closeCreationModal"></button>
-    </div>
-  </Teleport>
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted, reactive, ref } from 'vue'
-import ConstructeurSelect from '~/components/ConstructeurSelect.vue'
-import { useComponentTypes } from '~/composables/useComponentTypes'
+import { computed, onMounted } from 'vue'
 import { useComposants } from '~/composables/useComposants'
-import { useToast } from '~/composables/useToast'
-import { formatStructurePreview, sanitizeDefinitionOverrides } from '~/shared/modelUtils'
-import type { ComponentModelStructure } from '~/shared/types/inventory'
-import type { ModelType } from '~/services/modelTypes'
-
-interface ComponentCatalogType extends ModelType {
-  structure: ComponentModelStructure | null
-  customFields?: Array<Record<string, any>>
-  components?: Array<Record<string, any>>
-}
-
-const { componentTypes, loadComponentTypes, loadingComponentTypes } = useComponentTypes()
-const { createComposant } = useComposants()
-const toast = useToast()
-
-const creationModalOpen = ref(false)
-const selectedType = ref<ComponentCatalogType | null>(null)
-const submitting = ref(false)
-const creationForm = reactive({
-  name: '' as string,
-  reference: '' as string,
-  constructeurId: null as string | null,
-  prix: '' as string,
-})
-
-const loadingTypes = computed(() => loadingComponentTypes.value)
-const componentTypeList = computed<ComponentCatalogType[]>(() =>
-  (componentTypes.value || [])
-    .filter((item: any) => item?.category === 'COMPONENT') as ComponentCatalogType[],
-)
-
-const canSubmit = computed(() => Boolean(selectedType.value && !submitting.value))
-
-const getCategoryCustomFields = (type: ComponentCatalogType) => {
-  return Array.isArray(type?.customFields) ? type.customFields : []
-}
-
-const getStructureCustomFields = (structure: ComponentModelStructure | null) => {
-  return Array.isArray(structure?.customFields) ? structure.customFields : []
-}
-
-const getStructurePieces = (structure: ComponentModelStructure | null) => {
-  return Array.isArray(structure?.pieces) ? structure.pieces : []
-}
-
-const getStructureSubcomponents = (structure: ComponentModelStructure | null) => {
-  if (Array.isArray(structure?.subcomponents)) {
-    return structure.subcomponents
-  }
-  const legacy = (structure as any)?.subComponents
-  return Array.isArray(legacy) ? legacy : []
-}
-
-const getExistingComponents = (type: ComponentCatalogType) => {
-  return Array.isArray(type?.components) ? type.components : []
-}
-
-const resolvePieceLabel = (piece: Record<string, any>) => {
-  const parts: string[] = []
-  if (piece.role) {
-    parts.push(piece.role)
-  }
-  if (piece.typePiece?.name) {
-    parts.push(piece.typePiece.name)
-  } else if (piece.typePieceLabel) {
-    parts.push(piece.typePieceLabel)
-  } else if (piece.familyCode) {
-    parts.push(piece.familyCode)
-  } else if (piece.typePieceId) {
-    parts.push(`#${piece.typePieceId}`)
-  }
-  return parts.length ? parts.join(' • ') : 'Pièce'
-}
-
-const resolveSubcomponentLabel = (node: Record<string, any>) => {
-  const parts: string[] = []
-  if (node.alias) {
-    parts.push(node.alias)
-  }
-  if (node.typeComposant?.name) {
-    parts.push(node.typeComposant.name)
-  } else if (node.typeComposantLabel) {
-    parts.push(node.typeComposantLabel)
-  } else if (node.familyCode) {
-    parts.push(node.familyCode)
-  } else if (node.typeComposantId) {
-    parts.push(`#${node.typeComposantId}`)
-  }
-
-  const childCount = Array.isArray(node.subcomponents)
-    ? node.subcomponents.length
-    : Array.isArray(node.subComponents)
-      ? node.subComponents.length
-      : 0
-  if (childCount) {
-    parts.push(`${childCount} sous-composant(s)`)
-  }
-  return parts.length ? parts.join(' • ') : 'Sous-composant'
-}
-
-const clearCreationForm = () => {
-  creationForm.name = ''
-  creationForm.reference = ''
-  creationForm.constructeurId = null
-  creationForm.prix = ''
-}
-
-const resetCreationFormForType = () => {
-  clearCreationForm()
-  creationForm.name = selectedType.value?.name || ''
-}
-
-const openCreationModal = async (type: ComponentCatalogType) => {
-  selectedType.value = type
-  resetCreationFormForType()
-  creationModalOpen.value = true
-}
-
-const closeCreationModal = () => {
-  creationModalOpen.value = false
-  selectedType.value = null
-  clearCreationForm()
-}
-
-const submitCreation = async () => {
-  if (!selectedType.value) {
-    toast.showError('Aucune catégorie sélectionnée.')
-    return
-  }
-
-  const payload: Record<string, any> = {
-    typeComposantId: selectedType.value.id,
-  }
-
-  const overrides = sanitizeDefinitionOverrides({
-    name: creationForm.name,
-    reference: creationForm.reference,
-    constructeurId: creationForm.constructeurId,
-    prix: creationForm.prix,
-  })
-
-  if (overrides) {
-    payload.definition = overrides
-  }
-
-  submitting.value = true
-  try {
-    const result = await createComposant(payload)
-    if (result.success) {
-      await loadComponentTypes()
-      closeCreationModal()
-    } else if (result.error) {
-      toast.showError(result.error)
-    }
-  } catch (error: any) {
-    toast.showError(error?.message || "Erreur lors de la création du composant")
-  } finally {
-    submitting.value = false
-  }
-}
-
+const { composants, loadComposants, loading: loadingComposantsRef } = useComposants()
+const loadingComposants = computed(() => loadingComposantsRef.value)
+const composantsList = computed(() => composants.value || [])
 onMounted(async () => {
-  await loadComponentTypes()
+  await loadComposants()
 })
 </script>
diff --git a/app/pages/component/[id]/edit.vue b/app/pages/component/[id]/edit.vue
new file mode 100644
index 0000000..88f15c4
--- /dev/null
+++ b/app/pages/component/[id]/edit.vue
@@ -0,0 +1,730 @@
+<template>
+  <main class="container mx-auto px-6 py-10">
+    <div v-if="loading" class="flex flex-col items-center gap-4 py-20 text-center">
+      <span class="loading loading-spinner loading-lg" aria-hidden="true" />
+      <p class="text-sm text-base-content/70">Chargement du composant…</p>
+    </div>
+
+    <div v-else-if="!component" class="max-w-xl mx-auto">
+      <div class="alert alert-error shadow-lg">
+        <div>
+          <h2 class="font-semibold text-lg">Composant introuvable</h2>
+          <p class="text-sm text-base-content/80">
+            Nous n'avons pas pu retrouver le composant demandé. Il a peut-être été supprimé.
+          </p>
+        </div>
+      </div>
+      <NuxtLink to="/component-catalog" class="btn btn-primary mt-6">
+        Retour au catalogue
+      </NuxtLink>
+    </div>
+
+    <section v-else class="card border border-base-200 bg-base-100 shadow-sm max-w-5xl mx-auto">
+      <div class="card-body space-y-6">
+        <header class="flex flex-col gap-2 md:flex-row md:items-center md:justify-between">
+          <div>
+            <h1 class="text-3xl font-semibold text-base-content">Modifier le composant</h1>
+            <p class="text-sm text-base-content/70">
+              Mettez à jour les informations du composant et ses champs personnalisés.
+            </p>
+          </div>
+          <NuxtLink to="/component-catalog" class="btn btn-ghost btn-sm md:btn-md self-start">
+            Retour au catalogue
+          </NuxtLink>
+        </header>
+
+        <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+          <div class="form-control">
+            <label class="label">
+              <span class="label-text">Catégorie de composant</span>
+            </label>
+            <select
+              v-model="selectedTypeId"
+              class="select select-bordered select-sm md:select-md"
+              disabled
+            >
+              <option value="">Sélectionner une catégorie</option>
+              <option
+                v-for="type in componentTypeList"
+                :key="type.id"
+                :value="type.id"
+              >
+                {{ type.name }}
+              </option>
+            </select>
+            <p class="text-xs text-base-content/60 mt-1">
+              La catégorie d'origine ne peut pas être modifiée depuis cette page.
+            </p>
+          </div>
+        </div>
+
+        <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+          <div class="form-control">
+            <label class="label">
+              <span class="label-text">Nom du composant</span>
+            </label>
+            <input
+              v-model="editionForm.name"
+              type="text"
+              class="input input-bordered input-sm md:input-md"
+              :disabled="saving"
+              placeholder="Nom affiché dans le catalogue"
+              required
+            >
+          </div>
+        </div>
+
+        <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+          <div class="form-control">
+            <label class="label">
+              <span class="label-text">Référence</span>
+            </label>
+            <input
+              v-model="editionForm.reference"
+              type="text"
+              class="input input-bordered input-sm md:input-md"
+              :disabled="saving"
+              placeholder="Référence interne ou constructeur"
+            >
+          </div>
+
+          <div class="form-control">
+            <label class="label">
+              <span class="label-text">Constructeur</span>
+            </label>
+            <ConstructeurSelect
+              v-model="editionForm.constructeurId"
+              class="w-full"
+              :disabled="saving"
+              placeholder="Rechercher un constructeur..."
+            />
+          </div>
+        </div>
+
+        <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+          <div class="form-control">
+            <label class="label">
+              <span class="label-text">Prix indicatif (€)</span>
+            </label>
+            <input
+              v-model="editionForm.prix"
+              type="number"
+              step="0.01"
+              min="0"
+              class="input input-bordered input-sm md:input-md"
+              :disabled="saving"
+              placeholder="Valeur indicatrice"
+            >
+          </div>
+        </div>
+
+        <div v-if="selectedType" class="space-y-3 rounded-lg border border-base-200 bg-base-200/40 p-4">
+          <div class="flex items-center justify-between gap-4">
+            <div>
+              <h2 class="font-semibold text-base-content">Squelette sélectionné</h2>
+              <p class="text-xs text-base-content/70">
+                {{ selectedType.description || 'Ce squelette définit la structure et les contraintes du composant.' }}
+              </p>
+            </div>
+            <span class="badge badge-outline">{{ formatStructurePreview(selectedType.structure) }}</span>
+          </div>
+
+          <details v-if="selectedType.structure" class="collapse collapse-arrow bg-base-100">
+            <summary class="collapse-title text-sm font-medium">
+              Consulter le détail du squelette
+            </summary>
+            <div class="collapse-content space-y-4 text-sm text-base-content/80">
+              <div v-if="getStructureCustomFields(selectedType.structure).length" class="space-y-2">
+                <h3 class="font-semibold text-sm text-base-content">Champs personnalisés</h3>
+                <ul class="list-disc list-inside space-y-1">
+                  <li
+                    v-for="field in getStructureCustomFields(selectedType.structure)"
+                    :key="field.key || field.name"
+                  >
+                    <span class="font-medium">{{ field.key || field.name }}</span>
+                    <span v-if="field.value !== undefined && field.value !== null"> : {{ field.value }}</span>
+                  </li>
+                </ul>
+              </div>
+
+              <div v-if="getStructurePieces(selectedType.structure).length" class="space-y-2">
+                <h3 class="font-semibold text-sm text-base-content">Pièces imposées</h3>
+                <ul class="list-disc list-inside space-y-1">
+                  <li
+                    v-for="(piece, index) in getStructurePieces(selectedType.structure)"
+                    :key="piece.role || piece.typePieceId || piece.familyCode || index"
+                  >
+                    {{ resolvePieceLabel(piece) }}
+                  </li>
+                </ul>
+              </div>
+
+              <div v-if="getStructureSubcomponents(selectedType.structure).length" class="space-y-2">
+                <h3 class="font-semibold text-sm text-base-content">Sous-composants</h3>
+                <ul class="list-disc list-inside space-y-1">
+                  <li
+                    v-for="(subcomponent, index) in getStructureSubcomponents(selectedType.structure)"
+                    :key="subcomponent.alias || subcomponent.typeComposantId || subcomponent.familyCode || index"
+                  >
+                    {{ resolveSubcomponentLabel(subcomponent) }}
+                  </li>
+                </ul>
+              </div>
+
+              <p
+                v-if="!getStructureCustomFields(selectedType.structure).length && !getStructurePieces(selectedType.structure).length && !getStructureSubcomponents(selectedType.structure).length"
+                class="text-xs text-gray-500"
+              >
+                Ce squelette ne définit pas encore de pièces, sous-composants ou valeurs par défaut.
+              </p>
+            </div>
+          </details>
+        </div>
+
+        <div v-if="customFieldInputs.length" class="space-y-4 rounded-lg border border-base-200 bg-base-200/40 p-4">
+          <header class="space-y-1">
+            <h2 class="font-semibold text-base-content">Champs personnalisés</h2>
+            <p class="text-xs text-base-content/70">
+              Mettez à jour les valeurs propres à ce composant.
+            </p>
+          </header>
+          <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+            <div
+              v-for="(field, index) in customFieldInputs"
+              :key="fieldKey(field, index)"
+              class="form-control"
+            >
+              <label class="label">
+                <span class="label-text">{{ field.name }}</span>
+                <span v-if="field.required" class="label-text-alt text-error">*</span>
+              </label>
+              <input
+                v-if="field.type === 'text'"
+                v-model="field.value"
+                type="text"
+                class="input input-bordered input-sm md:input-md"
+                :required="field.required"
+                :disabled="saving"
+              >
+              <input
+                v-else-if="field.type === 'number'"
+                v-model="field.value"
+                type="number"
+                step="0.01"
+                class="input input-bordered input-sm md:input-md"
+                :required="field.required"
+                :disabled="saving"
+              >
+              <select
+                v-else-if="field.type === 'select'"
+                v-model="field.value"
+                class="select select-bordered select-sm md:select-md"
+                :required="field.required"
+                :disabled="saving"
+              >
+                <option value="">Sélectionner...</option>
+                <option
+                  v-for="option in field.options"
+                  :key="option"
+                  :value="option"
+                >
+                  {{ option }}
+                </option>
+              </select>
+              <div v-else-if="field.type === 'boolean'" class="flex items-center gap-2">
+                <input
+                  v-model="field.value"
+                  type="checkbox"
+                  class="checkbox checkbox-sm"
+                  true-value="true"
+                  false-value="false"
+                  :disabled="saving"
+                >
+                <span class="text-sm">{{ field.value === 'true' ? 'Oui' : 'Non' }}</span>
+              </div>
+              <input
+                v-else-if="field.type === 'date'"
+                v-model="field.value"
+                type="date"
+                class="input input-bordered input-sm md:input-md"
+                :required="field.required"
+                :disabled="saving"
+              >
+              <input
+                v-else
+                v-model="field.value"
+                type="text"
+                class="input input-bordered input-sm md:input-md"
+                :required="field.required"
+                :disabled="saving"
+              >
+            </div>
+          </div>
+        </div>
+
+        <div class="flex flex-col gap-3 md:flex-row md:justify-end">
+          <NuxtLink to="/component-catalog" class="btn btn-ghost" :class="{ 'btn-disabled': saving }">
+            Annuler
+          </NuxtLink>
+          <button type="button" class="btn btn-primary" :disabled="!canSubmit" @click="submitEdition">
+            <span v-if="saving" class="loading loading-spinner loading-sm mr-2" />
+            Enregistrer les modifications
+          </button>
+        </div>
+      </div>
+    </section>
+  </main>
+</template>
+
+<script setup lang="ts">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import { useRoute, useRouter } from '#imports'
+import ConstructeurSelect from '~/components/ConstructeurSelect.vue'
+import { useComponentTypes } from '~/composables/useComponentTypes'
+import { useComposants } from '~/composables/useComposants'
+import { useCustomFields } from '~/composables/useCustomFields'
+import { useApi } from '~/composables/useApi'
+import { useToast } from '~/composables/useToast'
+import { formatStructurePreview } from '~/shared/modelUtils'
+import type { ComponentModelStructure } from '~/shared/types/inventory'
+import type { ModelType } from '~/services/modelTypes'
+
+interface ComponentCatalogType extends ModelType {
+  structure: ComponentModelStructure | null
+  customFields?: Array<Record<string, any>>
+}
+
+interface CustomFieldInput {
+  id: string | null
+  name: string
+  type: string
+  required: boolean
+  options: string[]
+  value: string
+  customFieldId: string | null
+  customFieldValueId: string | null
+}
+
+const route = useRoute()
+const router = useRouter()
+const { get } = useApi()
+const { componentTypes, loadComponentTypes } = useComponentTypes()
+const { updateComposant } = useComposants()
+const { upsertCustomFieldValue, updateCustomFieldValue } = useCustomFields()
+const toast = useToast()
+
+const component = ref<any | null>(null)
+const loading = ref(true)
+const saving = ref(false)
+
+const selectedTypeId = ref<string>('')
+const editionForm = reactive({
+  name: '' as string,
+  reference: '' as string,
+  constructeurId: null as string | null,
+  prix: '' as string,
+})
+
+const customFieldInputs = ref<CustomFieldInput[]>([])
+
+const componentTypeList = computed<ComponentCatalogType[]>(() =>
+  (componentTypes.value || [])
+    .filter((item: any) => item?.category === 'COMPONENT') as ComponentCatalogType[],
+)
+
+const selectedType = computed(() => {
+  if (!selectedTypeId.value) {
+    return null
+  }
+  return componentTypeList.value.find((type) => type.id === selectedTypeId.value) ?? null
+})
+
+const requiredCustomFieldsFilled = computed(() =>
+  customFieldInputs.value.every((field) => {
+    if (!field.required) {
+      return true
+    }
+    if (field.type === 'boolean') {
+      return field.value === 'true' || field.value === 'false'
+    }
+    return field.value !== ''
+  }),
+)
+
+const canSubmit = computed(() => Boolean(
+  component.value &&
+  editionForm.name &&
+  requiredCustomFieldsFilled.value &&
+  !saving.value,
+))
+
+const fetchComponent = async () => {
+  const id = route.params.id
+  if (!id || typeof id !== 'string') {
+    component.value = null
+    return
+  }
+  const result = await get(`/composants/${id}`)
+  component.value = result.success ? result.data : null
+}
+
+let initialized = false
+
+watch(
+  [component, selectedType],
+  ([currentComponent, currentType]) => {
+    if (!currentComponent || initialized) {
+      return
+    }
+
+    selectedTypeId.value = currentComponent.typeComposantId || ''
+
+    editionForm.name = currentComponent.name || ''
+    editionForm.reference = currentComponent.reference || ''
+    editionForm.constructeurId = currentComponent.constructeur?.id || currentComponent.constructeurId || null
+    editionForm.prix = currentComponent.prix !== null && currentComponent.prix !== undefined ? String(currentComponent.prix) : ''
+
+    customFieldInputs.value = buildCustomFieldInputs(
+      currentType?.structure ?? null,
+      currentComponent.customFieldValues,
+    )
+
+    initialized = true
+  },
+  { immediate: true },
+)
+
+watch(selectedType, (currentType) => {
+  if (!component.value || !currentType) {
+    return
+  }
+  customFieldInputs.value = buildCustomFieldInputs(
+    currentType.structure,
+    component.value.customFieldValues,
+  )
+})
+
+const submitEdition = async () => {
+  if (!component.value) {
+    return
+  }
+
+  const rawPrice = typeof editionForm.prix === 'string'
+    ? editionForm.prix.trim()
+    : editionForm.prix === null || editionForm.prix === undefined
+      ? ''
+      : String(editionForm.prix).trim()
+
+  const payload: Record<string, any> = {
+    name: editionForm.name.trim(),
+  }
+
+  const reference = editionForm.reference.trim()
+  payload.reference = reference ? reference : null
+  payload.constructeurId = editionForm.constructeurId || null
+
+  if (rawPrice) {
+    const parsed = Number(rawPrice)
+    if (!Number.isNaN(parsed)) {
+      payload.prix = parsed
+    }
+  } else {
+    payload.prix = null
+  }
+
+  saving.value = true
+  try {
+    const result = await updateComposant(component.value.id, payload)
+    if (result.success) {
+      const updatedComponent = result.data
+      await saveCustomFieldValues(updatedComponent)
+      await router.push('/component-catalog')
+    }
+  } catch (error: any) {
+    toast.showError(error?.message || 'Erreur lors de la mise à jour du composant')
+  } finally {
+    saving.value = false
+  }
+}
+
+const buildCustomFieldInputs = (
+  structure: ComponentModelStructure | null,
+  values: any[] | null,
+): CustomFieldInput[] => {
+  const definitions = normalizeCustomFieldInputs(structure)
+  const valueList = Array.isArray(values) ? values : []
+
+  const mapById = new Map<string, any>()
+  const mapByName = new Map<string, any>()
+
+  valueList.forEach((entry) => {
+    if (!entry || typeof entry !== 'object') {
+      return
+    }
+    const fieldId = entry.customField?.id || entry.customFieldId || null
+    if (fieldId) {
+      mapById.set(fieldId, entry)
+    }
+    const fieldName = entry.customField?.name || entry.name || entry.key || null
+    if (fieldName) {
+      mapByName.set(fieldName, entry)
+    }
+  })
+
+  const resolved: CustomFieldInput[] = definitions.map((definition) => {
+    const definitionId = definition.customFieldId || definition.id || null
+    const matched = (definitionId ? mapById.get(definitionId) : null) || mapByName.get(definition.name)
+
+    if (!matched) {
+      return {
+        ...definition,
+        customFieldId: definition.customFieldId || definition.id,
+        customFieldValueId: null,
+      }
+    }
+
+    const resolvedValue = matched.value ?? ''
+    return {
+      ...definition,
+      customFieldId: matched.customField?.id || definition.customFieldId || definition.id,
+      customFieldValueId: matched.id ?? null,
+      value: formatDefaultValue(definition.type, resolvedValue),
+    }
+  })
+
+  return resolved
+}
+
+const fieldKey = (field: CustomFieldInput, index: number) =>
+  field.customFieldValueId || field.id || `${field.name}-${index}`
+
+const normalizeCustomFieldInputs = (structure: ComponentModelStructure | null): CustomFieldInput[] => {
+  if (!structure || typeof structure !== 'object') {
+    return []
+  }
+  const fields = Array.isArray(structure.customFields) ? structure.customFields : []
+  return fields
+    .map((field) => normalizeCustomField(field))
+    .filter((field): field is CustomFieldInput => field !== null)
+}
+
+const normalizeCustomField = (rawField: any): CustomFieldInput | null => {
+  if (!rawField || typeof rawField !== 'object') {
+    return null
+  }
+  const name = resolveFieldName(rawField)
+  if (!name) {
+    return null
+  }
+  const type = resolveFieldType(rawField)
+  const required = !!rawField.required
+  const options = Array.isArray(rawField.options)
+    ? rawField.options.filter((option: unknown): option is string => typeof option === 'string')
+    : []
+  const value = formatDefaultValue(type, rawField.value)
+  const id = typeof rawField.id === 'string' ? rawField.id : null
+  const customFieldId = typeof rawField.customFieldId === 'string' ? rawField.customFieldId : id
+  const customFieldValueId = typeof rawField.customFieldValueId === 'string'
+    ? rawField.customFieldValueId
+    : null
+  return { id, name, type, required, options, value, customFieldId, customFieldValueId }
+}
+
+const resolveFieldName = (field: any): string => {
+  if (typeof field?.name === 'string' && field.name.trim()) {
+    return field.name.trim()
+  }
+  if (typeof field?.key === 'string' && field.key.trim()) {
+    return field.key.trim()
+  }
+  if (typeof field?.label === 'string' && field.label.trim()) {
+    return field.label.trim()
+  }
+  return ''
+}
+
+const resolveFieldType = (field: any): string => {
+  const allowed = ['text', 'number', 'select', 'boolean', 'date']
+  const value = typeof field?.type === 'string' ? field.type.toLowerCase() : ''
+  return allowed.includes(value) ? value : 'text'
+}
+
+const formatDefaultValue = (type: string, defaultValue: any): string => {
+  if (defaultValue === null || defaultValue === undefined) {
+    return ''
+  }
+  if (type === 'boolean') {
+    const normalized = String(defaultValue).toLowerCase()
+    if (normalized === 'true' || normalized === '1') {
+      return 'true'
+    }
+    if (normalized === 'false' || normalized === '0') {
+      return 'false'
+    }
+    return ''
+  }
+  return String(defaultValue)
+}
+
+const getStructureCustomFields = (structure: ComponentModelStructure | null) => {
+  return Array.isArray(structure?.customFields) ? structure.customFields : []
+}
+
+const getStructurePieces = (structure: ComponentModelStructure | null) => {
+  return Array.isArray(structure?.pieces) ? structure.pieces : []
+}
+
+const getStructureSubcomponents = (structure: ComponentModelStructure | null) => {
+  if (Array.isArray(structure?.subcomponents)) {
+    return structure.subcomponents
+  }
+  const legacy = (structure as any)?.subComponents
+  return Array.isArray(legacy) ? legacy : []
+}
+
+const resolvePieceLabel = (piece: Record<string, any>) => {
+  const parts: string[] = []
+  if (piece.role) {
+    parts.push(piece.role)
+  }
+  if (piece.typePiece?.name) {
+    parts.push(piece.typePiece.name)
+  } else if (piece.typePieceLabel) {
+    parts.push(piece.typePieceLabel)
+  } else if (piece.familyCode) {
+    parts.push(piece.familyCode)
+  } else if (piece.typePieceId) {
+    parts.push(`#${piece.typePieceId}`)
+  }
+  return parts.length ? parts.join(' • ') : 'Pièce'
+}
+
+const resolveSubcomponentLabel = (node: Record<string, any>) => {
+  const parts: string[] = []
+  if (node.alias) {
+    parts.push(node.alias)
+  }
+  if (node.typeComposant?.name) {
+    parts.push(node.typeComposant.name)
+  } else if (node.typeComposantLabel) {
+    parts.push(node.typeComposantLabel)
+  } else if (node.familyCode) {
+    parts.push(node.familyCode)
+  } else if (node.typeComposantId) {
+    parts.push(`#${node.typeComposantId}`)
+  }
+
+  const childCount = Array.isArray(node.subcomponents)
+    ? node.subcomponents.length
+    : Array.isArray(node.subComponents)
+      ? node.subComponents.length
+      : 0
+  if (childCount) {
+    parts.push(`${childCount} sous-composant(s)`)
+  }
+  return parts.length ? parts.join(' • ') : 'Sous-composant'
+}
+
+const buildCustomFieldMetadata = (field: CustomFieldInput) => ({
+  customFieldName: field.name,
+  customFieldType: field.type,
+  customFieldRequired: field.required,
+  customFieldOptions: field.options,
+})
+
+const shouldPersistField = (field: CustomFieldInput) => {
+  if (field.type === 'boolean') {
+    return field.value === 'true' || field.value === 'false'
+  }
+  return field.value.trim() !== ''
+}
+
+const formatValueForPersistence = (field: CustomFieldInput) => {
+  if (field.type === 'boolean') {
+    return field.value === 'true' ? 'true' : 'false'
+  }
+  return field.value.trim()
+}
+
+const saveCustomFieldValues = async (updatedComponent: any) => {
+  if (!updatedComponent || !updatedComponent.id) {
+    return
+  }
+
+  const definitionMap = new Map<string, string>()
+  const registerDefinitions = (fields: any[]) => {
+    if (!Array.isArray(fields)) {
+      return
+    }
+    fields.forEach((field) => {
+      if (!field || typeof field !== 'object') {
+        return
+      }
+      const name = typeof field.name === 'string' ? field.name : null
+      const id = typeof field.id === 'string' ? field.id : null
+      if (name && id && !definitionMap.has(name)) {
+        definitionMap.set(name, id)
+      }
+    })
+  }
+
+  registerDefinitions(updatedComponent?.typeComposant?.customFields)
+  registerDefinitions(updatedComponent?.typeMachineComponentRequirement?.typeComposant?.customFields)
+
+  const resolveDefinitionId = (field: CustomFieldInput) => {
+    if (field.customFieldId) {
+      return field.customFieldId
+    }
+    if (field.id) {
+      return field.id
+    }
+    return definitionMap.get(field.name) ?? null
+  }
+
+  for (const field of customFieldInputs.value) {
+    if (!shouldPersistField(field)) {
+      continue
+    }
+
+    const definitionId = resolveDefinitionId(field)
+    const metadata = definitionId ? undefined : buildCustomFieldMetadata(field)
+    const value = formatValueForPersistence(field)
+
+    if (field.customFieldValueId) {
+      const result = await updateCustomFieldValue(field.customFieldValueId, { value })
+      if (!result.success) {
+        toast.showError(`Impossible de mettre à jour le champ personnalisé "${field.name}"`)
+      } else if (definitionId && !field.customFieldId) {
+        field.customFieldId = definitionId
+      }
+      continue
+    }
+
+    const result = await upsertCustomFieldValue(
+      definitionId,
+      'composant',
+      updatedComponent.id,
+      value,
+      metadata,
+    )
+
+    if (!result.success) {
+      toast.showError(`Impossible d'enregistrer le champ personnalisé "${field.name}"`)
+    } else {
+      const createdValue = result.data
+      if (createdValue?.id) {
+        field.customFieldValueId = createdValue.id
+      }
+      const resolvedId = createdValue?.customField?.id || definitionId
+      if (resolvedId) {
+        field.customFieldId = resolvedId
+      }
+    }
+  }
+}
+
+onMounted(async () => {
+  await Promise.allSettled([loadComponentTypes(), fetchComponent()])
+  loading.value = false
+})
+</script>
diff --git a/app/pages/component/create.vue b/app/pages/component/create.vue
new file mode 100644
index 0000000..f0c677a
--- /dev/null
+++ b/app/pages/component/create.vue
@@ -0,0 +1,658 @@
+<template>
+  <main class="mx-auto flex w-full max-w-5xl flex-col gap-8 px-4 py-8 sm:px-6 lg:px-8">
+    <header class="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">
+      <div class="space-y-1">
+        <h1 class="text-3xl font-semibold text-base-content">Nouvel composant</h1>
+        <p class="text-sm text-base-content/70">
+          Sélectionnez la catégorie cible puis complétez les informations du composant.
+        </p>
+      </div>
+      <NuxtLink to="/component-catalog" class="btn btn-ghost btn-sm md:btn-md self-start">
+        Retour au catalogue
+      </NuxtLink>
+    </header>
+
+    <section class="card border border-base-200 bg-base-100 shadow-sm">
+      <div class="card-body space-y-6">
+        <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+          <div class="form-control">
+            <label class="label">
+              <span class="label-text">Catégorie de composant</span>
+            </label>
+            <select
+              v-model="selectedTypeId"
+              class="select select-bordered select-sm md:select-md"
+              :disabled="loadingTypes || submitting"
+              required
+            >
+              <option value="">Sélectionner une catégorie</option>
+              <option
+                v-for="type in componentTypeList"
+                :key="type.id"
+                :value="type.id"
+              >
+                {{ type.name }}
+              </option>
+            </select>
+            <p v-if="loadingTypes" class="text-xs text-gray-500 mt-1">
+              Chargement des catégories…
+            </p>
+          </div>
+        </div>
+
+        <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+          <div class="form-control">
+            <label class="label">
+              <span class="label-text">Nom du composant</span>
+            </label>
+            <input
+              v-model="creationForm.name"
+              type="text"
+              class="input input-bordered input-sm md:input-md"
+              :disabled="submitting || !selectedType"
+              placeholder="Nom affiché dans le catalogue"
+              required
+            >
+          </div>
+        </div>
+
+        <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+          <div class="form-control">
+            <label class="label">
+              <span class="label-text">Référence</span>
+            </label>
+            <input
+              v-model="creationForm.reference"
+              type="text"
+              class="input input-bordered input-sm md:input-md"
+              :disabled="submitting || !selectedType"
+              placeholder="Référence interne ou constructeur"
+            >
+          </div>
+
+          <div class="form-control">
+            <label class="label">
+              <span class="label-text">Constructeur</span>
+            </label>
+            <ConstructeurSelect
+              v-model="creationForm.constructeurId"
+              class="w-full"
+              :disabled="submitting || !selectedType"
+              placeholder="Rechercher un constructeur..."
+            />
+          </div>
+        </div>
+
+        <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+          <div class="form-control">
+            <label class="label">
+              <span class="label-text">Prix indicatif (€)</span>
+            </label>
+            <input
+              v-model="creationForm.prix"
+              type="number"
+              step="0.01"
+              min="0"
+              class="input input-bordered input-sm md:input-md"
+              :disabled="submitting || !selectedType"
+              placeholder="Valeur indicatrice"
+            >
+          </div>
+        </div>
+
+        <div v-if="selectedType" class="space-y-3 rounded-lg border border-base-200 bg-base-200/40 p-4">
+          <div class="flex items-center justify-between gap-4">
+            <div>
+              <h2 class="font-semibold text-base-content">Squelette sélectionné</h2>
+              <p class="text-xs text-base-content/70">
+                {{ selectedType.description || 'Ce squelette définit la structure et les contraintes du composant.' }}
+              </p>
+            </div>
+            <span class="badge badge-outline">{{ formatStructurePreview(selectedType.structure) }}</span>
+          </div>
+
+          <details v-if="selectedType.structure" class="collapse collapse-arrow bg-base-100">
+            <summary class="collapse-title text-sm font-medium">
+              Consulter le détail du squelette
+            </summary>
+            <div class="collapse-content space-y-4 text-sm text-base-content/80">
+              <div v-if="getStructureCustomFields(selectedType.structure).length" class="space-y-2">
+                <h3 class="font-semibold text-sm text-base-content">Champs personnalisés</h3>
+                <ul class="list-disc list-inside space-y-1">
+                  <li
+                    v-for="field in getStructureCustomFields(selectedType.structure)"
+                    :key="field.key || field.name"
+                  >
+                    <span class="font-medium">{{ field.key || field.name }}</span>
+                    <span v-if="field.value !== undefined && field.value !== null"> : {{ field.value }}</span>
+                  </li>
+                </ul>
+              </div>
+
+              <div v-if="getStructurePieces(selectedType.structure).length" class="space-y-2">
+                <h3 class="font-semibold text-sm text-base-content">Pièces imposées</h3>
+                <ul class="list-disc list-inside space-y-1">
+                  <li
+                    v-for="(piece, index) in getStructurePieces(selectedType.structure)"
+                    :key="piece.role || piece.typePieceId || piece.familyCode || index"
+                  >
+                    {{ resolvePieceLabel(piece) }}
+                  </li>
+                </ul>
+              </div>
+
+              <div v-if="getStructureSubcomponents(selectedType.structure).length" class="space-y-2">
+                <h3 class="font-semibold text-sm text-base-content">Sous-composants</h3>
+                <ul class="list-disc list-inside space-y-1">
+                  <li
+                    v-for="(subcomponent, index) in getStructureSubcomponents(selectedType.structure)"
+                    :key="subcomponent.alias || subcomponent.typeComposantId || subcomponent.familyCode || index"
+                  >
+                    {{ resolveSubcomponentLabel(subcomponent) }}
+                  </li>
+                </ul>
+              </div>
+            </div>
+          </details>
+        </div>
+
+        <div v-if="customFieldInputs.length" class="space-y-4 rounded-lg border border-base-200 bg-base-200/40 p-4">
+          <header class="space-y-1">
+            <h2 class="font-semibold text-base-content">Champs personnalisés</h2>
+            <p class="text-xs text-base-content/70">
+              Renseignez les valeurs propres à ce composant selon le squelette choisi.
+            </p>
+          </header>
+          <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+            <div
+              v-for="(field, index) in customFieldInputs"
+              :key="fieldKey(field, index)"
+              class="form-control"
+            >
+              <label class="label">
+                <span class="label-text">{{ field.name }}</span>
+                <span v-if="field.required" class="label-text-alt text-error">*</span>
+              </label>
+              <input
+                v-if="field.type === 'text'"
+                v-model="field.value"
+                type="text"
+                class="input input-bordered input-sm md:input-md"
+                :required="field.required"
+                :disabled="submitting"
+              >
+              <input
+                v-else-if="field.type === 'number'"
+                v-model="field.value"
+                type="number"
+                step="0.01"
+                class="input input-bordered input-sm md:input-md"
+                :required="field.required"
+                :disabled="submitting"
+              >
+              <select
+                v-else-if="field.type === 'select'"
+                v-model="field.value"
+                class="select select-bordered select-sm md:select-md"
+                :required="field.required"
+                :disabled="submitting"
+              >
+                <option value="">Sélectionner...</option>
+                <option
+                  v-for="option in field.options"
+                  :key="option"
+                  :value="option"
+                >
+                  {{ option }}
+                </option>
+              </select>
+              <div v-else-if="field.type === 'boolean'" class="flex items-center gap-2">
+                <input
+                  v-model="field.value"
+                  type="checkbox"
+                  class="checkbox checkbox-sm"
+                  true-value="true"
+                  false-value="false"
+                  :disabled="submitting"
+                >
+                <span class="text-sm">{{ field.value === 'true' ? 'Oui' : 'Non' }}</span>
+              </div>
+              <input
+                v-else-if="field.type === 'date'"
+                v-model="field.value"
+                type="date"
+                class="input input-bordered input-sm md:input-md"
+                :required="field.required"
+                :disabled="submitting"
+              >
+              <input
+                v-else
+                v-model="field.value"
+                type="text"
+                class="input input-bordered input-sm md:input-md"
+                :required="field.required"
+                :disabled="submitting"
+              >
+            </div>
+          </div>
+        </div>
+
+        <div class="flex flex-col gap-3 md:flex-row md:justify-end">
+          <NuxtLink to="/component-catalog" class="btn btn-ghost" :class="{ 'btn-disabled': submitting }">
+            Annuler
+          </NuxtLink>
+          <button type="button" class="btn btn-primary" :disabled="!canSubmit" @click="submitCreation">
+            <span v-if="submitting" class="loading loading-spinner loading-sm mr-2"></span>
+            Créer le composant
+          </button>
+        </div>
+      </div>
+    </section>
+  </main>
+</template>
+
+<script setup lang="ts">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import { useRoute, useRouter } from '#imports'
+import ConstructeurSelect from '~/components/ConstructeurSelect.vue'
+import { useComponentTypes } from '~/composables/useComponentTypes'
+import { useComposants } from '~/composables/useComposants'
+import { useToast } from '~/composables/useToast'
+import { useCustomFields } from '~/composables/useCustomFields'
+import { formatStructurePreview } from '~/shared/modelUtils'
+import type { ComponentModelStructure } from '~/shared/types/inventory'
+import type { ModelType } from '~/services/modelTypes'
+
+interface ComponentCatalogType extends ModelType {
+  structure: ComponentModelStructure | null
+  customFields?: Array<Record<string, any>>
+}
+
+const route = useRoute()
+const router = useRouter()
+
+const { componentTypes, loadComponentTypes, loadingComponentTypes } = useComponentTypes()
+const { createComposant } = useComposants()
+const toast = useToast()
+const { upsertCustomFieldValue, updateCustomFieldValue } = useCustomFields()
+
+const initialTypeId = ref<string>(typeof route.query.typeId === 'string' ? route.query.typeId : '')
+const selectedTypeId = ref<string>(initialTypeId.value)
+const submitting = ref(false)
+const creationForm = reactive({
+  name: '' as string,
+  reference: '' as string,
+  constructeurId: null as string | null,
+  prix: '' as string,
+})
+const lastSuggestedName = ref('')
+const customFieldInputs = ref<CustomFieldInput[]>([])
+
+watch(
+  () => route.query.typeId,
+  (value) => {
+    if (typeof value === 'string') {
+      selectedTypeId.value = value
+    }
+  },
+)
+
+watch(selectedTypeId, (id) => {
+  const current = typeof route.query.typeId === 'string' ? route.query.typeId : ''
+  if ((id || '') === current) {
+    return
+  }
+  const nextQuery = { ...route.query }
+  if (id) {
+    nextQuery.typeId = id
+  } else {
+    delete nextQuery.typeId
+  }
+  router.replace({ path: route.path, query: nextQuery }).catch(() => {})
+})
+
+const loadingTypes = computed(() => loadingComponentTypes.value)
+const componentTypeList = computed<ComponentCatalogType[]>(() =>
+  (componentTypes.value || [])
+    .filter((item: any) => item?.category === 'COMPONENT') as ComponentCatalogType[],
+)
+
+const selectedType = computed(() => {
+  if (!selectedTypeId.value) {
+    return null
+  }
+  return componentTypeList.value.find((type) => type.id === selectedTypeId.value) ?? null
+})
+
+watch(selectedType, (type) => {
+  if (!type) {
+    clearCreationForm()
+    customFieldInputs.value = []
+    return
+  }
+  if (!creationForm.name || creationForm.name === lastSuggestedName.value) {
+    creationForm.name = type.name
+  }
+  lastSuggestedName.value = creationForm.name
+  customFieldInputs.value = normalizeCustomFieldInputs(type.structure)
+})
+
+const requiredCustomFieldsFilled = computed(() =>
+  customFieldInputs.value.every((field) => {
+    if (!field.required) {
+      return true
+    }
+    if (field.type === 'boolean') {
+      return field.value === 'true' || field.value === 'false'
+    }
+    return field.value !== ''
+  }),
+)
+
+const canSubmit = computed(() => Boolean(
+  selectedType.value &&
+  creationForm.name &&
+  requiredCustomFieldsFilled.value &&
+  !submitting.value,
+))
+
+const getStructureCustomFields = (structure: ComponentModelStructure | null) => {
+  return Array.isArray(structure?.customFields) ? structure.customFields : []
+}
+
+const getStructurePieces = (structure: ComponentModelStructure | null) => {
+  return Array.isArray(structure?.pieces) ? structure.pieces : []
+}
+
+const getStructureSubcomponents = (structure: ComponentModelStructure | null) => {
+  if (Array.isArray(structure?.subcomponents)) {
+    return structure.subcomponents
+  }
+  const legacy = (structure as any)?.subComponents
+  return Array.isArray(legacy) ? legacy : []
+}
+
+const resolvePieceLabel = (piece: Record<string, any>) => {
+  const parts: string[] = []
+  if (piece.role) {
+    parts.push(piece.role)
+  }
+  if (piece.typePiece?.name) {
+    parts.push(piece.typePiece.name)
+  } else if (piece.typePieceLabel) {
+    parts.push(piece.typePieceLabel)
+  } else if (piece.familyCode) {
+    parts.push(piece.familyCode)
+  } else if (piece.typePieceId) {
+    parts.push(`#${piece.typePieceId}`)
+  }
+  return parts.length ? parts.join(' • ') : 'Pièce'
+}
+
+const resolveSubcomponentLabel = (node: Record<string, any>) => {
+  const parts: string[] = []
+  if (node.alias) {
+    parts.push(node.alias)
+  }
+  if (node.typeComposant?.name) {
+    parts.push(node.typeComposant.name)
+  } else if (node.typeComposantLabel) {
+    parts.push(node.typeComposantLabel)
+  } else if (node.familyCode) {
+    parts.push(node.familyCode)
+  } else if (node.typeComposantId) {
+    parts.push(`#${node.typeComposantId}`)
+  }
+
+  const childCount = Array.isArray(node.subcomponents)
+    ? node.subcomponents.length
+    : Array.isArray(node.subComponents)
+      ? node.subComponents.length
+      : 0
+  if (childCount) {
+    parts.push(`${childCount} sous-composant(s)`)
+  }
+  return parts.length ? parts.join(' • ') : 'Sous-composant'
+}
+
+const clearCreationForm = () => {
+  creationForm.name = ''
+  creationForm.reference = ''
+  creationForm.constructeurId = null
+  creationForm.prix = ''
+  lastSuggestedName.value = ''
+}
+
+const submitCreation = async () => {
+  if (!selectedType.value) {
+    toast.showError('Sélectionnez une catégorie de composant.')
+    return
+  }
+  const payload: Record<string, any> = {
+    name: creationForm.name.trim(),
+    typeComposantId: selectedType.value.id,
+  }
+
+  const reference = creationForm.reference.trim()
+  if (reference) {
+    payload.reference = reference
+  }
+
+  if (creationForm.constructeurId) {
+    payload.constructeurId = creationForm.constructeurId
+  }
+
+  const rawPrice = typeof creationForm.prix === 'string'
+    ? creationForm.prix.trim()
+    : creationForm.prix === null || creationForm.prix === undefined
+      ? ''
+      : String(creationForm.prix).trim()
+
+  if (rawPrice) {
+    const parsed = Number(rawPrice)
+    if (!Number.isNaN(parsed)) {
+      payload.prix = parsed
+    }
+  }
+
+  submitting.value = true
+  try {
+    const result = await createComposant(payload)
+    if (result.success) {
+      await saveCustomFieldValues(result.data)
+      toast.showSuccess('Composant créé avec succès')
+      await router.push('/component-catalog')
+    } else if (result.error) {
+      toast.showError(result.error)
+    }
+  } catch (error: any) {
+    toast.showError(error?.message || 'Erreur lors de la création du composant')
+  } finally {
+    submitting.value = false
+  }
+}
+
+onMounted(async () => {
+  await loadComponentTypes()
+})
+
+interface CustomFieldInput {
+  id: string | null
+  name: string
+  type: string
+  required: boolean
+  options: string[]
+  value: string
+  customFieldId: string | null
+  customFieldValueId: string | null
+}
+
+const fieldKey = (field: CustomFieldInput, index: number) =>
+  field.customFieldValueId || field.id || `${field.name}-${index}`
+
+const normalizeCustomFieldInputs = (structure: ComponentModelStructure | null): CustomFieldInput[] => {
+  if (!structure || typeof structure !== 'object') {
+    return []
+  }
+  const fields = Array.isArray(structure.customFields) ? structure.customFields : []
+  return fields
+    .map((field) => normalizeCustomField(field))
+    .filter((field): field is CustomFieldInput => field !== null)
+}
+
+const normalizeCustomField = (rawField: any): CustomFieldInput | null => {
+  if (!rawField || typeof rawField !== 'object') {
+    return null
+  }
+  const name = resolveFieldName(rawField)
+  if (!name) {
+    return null
+  }
+  const type = resolveFieldType(rawField)
+  const required = !!rawField.required
+  const options = Array.isArray(rawField.options)
+    ? rawField.options.filter((option: unknown): option is string => typeof option === 'string')
+    : []
+  const value = formatDefaultValue(type, rawField.value)
+  const id = typeof rawField.id === 'string' ? rawField.id : null
+  const customFieldId = typeof rawField.customFieldId === 'string' ? rawField.customFieldId : id
+  const customFieldValueId = typeof rawField.customFieldValueId === 'string'
+    ? rawField.customFieldValueId
+    : null
+  return { id, name, type, required, options, value, customFieldId, customFieldValueId }
+}
+
+const resolveFieldName = (field: any): string => {
+  if (typeof field?.name === 'string' && field.name.trim()) {
+    return field.name.trim()
+  }
+  if (typeof field?.key === 'string' && field.key.trim()) {
+    return field.key.trim()
+  }
+  if (typeof field?.label === 'string' && field.label.trim()) {
+    return field.label.trim()
+  }
+  return ''
+}
+
+const resolveFieldType = (field: any): string => {
+  const allowed = ['text', 'number', 'select', 'boolean', 'date']
+  const value = typeof field?.type === 'string' ? field.type.toLowerCase() : ''
+  return allowed.includes(value) ? value : 'text'
+}
+
+const formatDefaultValue = (type: string, defaultValue: any): string => {
+  if (defaultValue === null || defaultValue === undefined) {
+    return ''
+  }
+  if (type === 'boolean') {
+    const normalized = String(defaultValue).toLowerCase()
+    if (normalized === 'true' || normalized === '1') {
+      return 'true'
+    }
+    if (normalized === 'false' || normalized === '0') {
+      return 'false'
+    }
+    return ''
+  }
+  return String(defaultValue)
+}
+
+const buildCustomFieldMetadata = (field: CustomFieldInput) => ({
+  customFieldName: field.name,
+  customFieldType: field.type,
+  customFieldRequired: field.required,
+  customFieldOptions: field.options,
+})
+
+const saveCustomFieldValues = async (createdComponent: any) => {
+  if (!createdComponent || !createdComponent.id) {
+    return
+  }
+
+  const definitionMap = new Map<string, string>()
+  const registerDefinitions = (fields: any[]) => {
+    if (!Array.isArray(fields)) {
+      return
+    }
+    fields.forEach((field) => {
+      if (!field || typeof field !== 'object') {
+        return
+      }
+      const name = typeof field.name === 'string' ? field.name : null
+      const id = typeof field.id === 'string' ? field.id : null
+      if (name && id && !definitionMap.has(name)) {
+        definitionMap.set(name, id)
+      }
+    })
+  }
+
+  registerDefinitions(createdComponent?.typeComposant?.customFields)
+  registerDefinitions(createdComponent?.typeMachineComponentRequirement?.typeComposant?.customFields)
+
+  const resolveDefinitionId = (field: CustomFieldInput) => {
+    if (field.customFieldId) {
+      return field.customFieldId
+    }
+    if (field.id) {
+      return field.id
+    }
+    return definitionMap.get(field.name) ?? null
+  }
+
+  for (const field of customFieldInputs.value) {
+    if (!shouldPersistField(field)) {
+      continue
+    }
+
+    const definitionId = resolveDefinitionId(field)
+    const metadata = definitionId ? undefined : buildCustomFieldMetadata(field)
+    const value = formatValueForPersistence(field)
+
+    if (field.customFieldValueId) {
+      const result = await updateCustomFieldValue(field.customFieldValueId, { value })
+      if (!result.success) {
+        toast.showError(`Impossible de mettre à jour le champ personnalisé "${field.name}"`)
+      } else if (definitionId && !field.customFieldId) {
+        field.customFieldId = definitionId
+      }
+      continue
+    }
+
+    const result = await upsertCustomFieldValue(
+      definitionId,
+      'composant',
+      createdComponent.id,
+      value,
+      metadata,
+    )
+
+    if (!result.success) {
+      toast.showError(`Impossible d'enregistrer le champ personnalisé "${field.name}"`)
+    } else {
+      const createdValue = result.data
+      if (createdValue?.id) {
+        field.customFieldValueId = createdValue.id
+      }
+      const resolvedId = createdValue?.customField?.id || definitionId
+      if (resolvedId) {
+        field.customFieldId = resolvedId
+      }
+    }
+  }
+}
+
+const shouldPersistField = (field: CustomFieldInput) => {
+  if (field.type === 'boolean') {
+    return field.value === 'true' || field.value === 'false'
+  }
+  return field.value.trim() !== ''
+}
+
+const formatValueForPersistence = (field: CustomFieldInput) => {
+  if (field.type === 'boolean') {
+    return field.value === 'true' ? 'true' : 'false'
+  }
+  return field.value.trim()
+}
+</script>
diff --git a/app/pages/machines/new.vue b/app/pages/machines/new.vue
index 37907b2..26c215b 100644
--- a/app/pages/machines/new.vue
+++ b/app/pages/machines/new.vue
@@ -158,73 +158,61 @@
                     </button>
                   </div>
 
-                  <div class="grid grid-cols-1 md:grid-cols-2 gap-3">
-                    <div class="form-control md:col-span-2">
-                      <label class="label">
-                        <span class="label-text text-xs">Catégorie de composant</span>
-                      </label>
-                      <select
-                        class="select select-bordered select-xs md:select-sm"
-                        :value="entry.typeComposantId || requirement.typeComposantId || ''"
-                        @change="setComponentRequirementType(requirement.id, entryIndex, ($event.target && $event.target.value) || '')"
-                      >
-                        <option value="">
-                          {{ requirement.typeComposant?.name ? `Type du requirement (${requirement.typeComposant.name})` : 'Suivre le requirement' }}
-                        </option>
-                        <option
-                          v-for="type in componentTypeOptions"
-                          :key="type.id"
-                          :value="type.id"
+                  <div class="grid grid-cols-1 gap-3">
+                    <div class="space-y-2">
+                      <div class="form-control">
+                        <label class="label">
+                          <span class="label-text text-xs">Composant existant</span>
+                        </label>
+                        <select
+                          class="select select-bordered select-sm"
+                          :value="entry.composantId || ''"
+                          @change="setComponentRequirementComponent(requirement, entryIndex, ($event.target && $event.target.value) || '')"
                         >
-                          {{ type.name }}
-                        </option>
-                      </select>
-                    </div>
-                    <div class="form-control">
-                      <label class="label">
-                        <span class="label-text text-xs">Nom du composant</span>
-                      </label>
-                      <input
-                        v-model="entry.definition.name"
-                        type="text"
-                        class="input input-bordered input-sm"
-                        placeholder="Nom du composant"
+                          <option value="">
+                            Sélectionner un composant disponible
+                          </option>
+                          <option
+                            v-for="component in getComponentOptions(requirement, entry)"
+                            :key="component.id"
+                            :value="component.id"
+                          >
+                            {{ formatComponentOption(component) }}
+                          </option>
+                        </select>
+                      </div>
+                      <p
+                        v-if="getComponentOptions(requirement, entry).length === 0"
+                        class="text-xs text-error"
                       >
+                        Aucun composant disponible pour cette famille.
+                      </p>
                     </div>
-                    <div class="form-control">
-                      <label class="label">
-                        <span class="label-text text-xs">Référence (optionnel)</span>
-                      </label>
-                      <input
-                        v-model="entry.definition.reference"
-                        type="text"
-                        class="input input-bordered input-sm"
-                        placeholder="Référence du composant"
-                      >
-                    </div>
-                    <div class="form-control">
-                      <label class="label">
-                        <span class="label-text text-xs">Constructeur (optionnel)</span>
-                      </label>
-                      <ConstructeurSelect
-                        class="w-full"
-                        :model-value="entry.definition.constructeurId || null"
-                        placeholder="Sélectionner un constructeur"
-                        @update:modelValue="(value) => setComponentRequirementConstructeur(requirement.id, entryIndex, value)"
-                      />
-                    </div>
-                    <div class="form-control">
-                      <label class="label">
-                        <span class="label-text text-xs">Prix (optionnel)</span>
-                      </label>
-                      <input
-                        v-model.number="entry.definition.prix"
-                        type="number"
-                        min="0"
-                        step="0.01"
-                        class="input input-bordered input-sm"
-                        placeholder="0.00"
+
+                    <div
+                      v-if="entry.composantId"
+                      class="bg-base-300/60 rounded-md p-3 text-xs text-gray-600 space-y-1"
+                    >
+                      <div class="font-medium">
+                        {{ (findComponentById(entry.composantId)?.name) || "Composant" }}
+                      </div>
+                      <div>
+                        Référence : {{ findComponentById(entry.composantId)?.reference || "—" }}
+                      </div>
+                      <div>
+                        Constructeur :
+                        {{ findComponentById(entry.composantId)?.constructeur?.name || findComponentById(entry.composantId)?.constructeurName || "—" }}
+                      </div>
+                      <div>
+                        Machine actuelle :
+                        {{ findComponentById(entry.composantId)?.machine?.name || findComponentById(entry.composantId)?.machineId || "Non affecté" }}
+                      </div>
+                      <div
+                        v-if="findComponentById(entry.composantId)?.machine?.name"
+                        class="text-warning mt-1"
                       >
+                        La réaffectation détachera ce composant de sa machine actuelle lors de la création.
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -286,73 +274,65 @@
                     </button>
                   </div>
 
-                  <div class="grid grid-cols-1 md:grid-cols-2 gap-3">
-                    <div class="form-control md:col-span-2">
-                      <label class="label">
-                        <span class="label-text text-xs">Catégorie de pièce</span>
-                      </label>
-                      <select
-                        class="select select-bordered select-xs md:select-sm"
-                        :value="entry.typePieceId || requirement.typePieceId || ''"
-                        @change="setPieceRequirementType(requirement.id, entryIndex, ($event.target && $event.target.value) || '')"
-                      >
-                        <option value="">
-                          {{ requirement.typePiece?.name ? `Type du requirement (${requirement.typePiece.name})` : 'Suivre le requirement' }}
-                        </option>
-                        <option
-                          v-for="type in pieceTypeOptions"
-                          :key="type.id"
-                          :value="type.id"
+                  <div class="grid grid-cols-1 gap-3">
+                    <div class="space-y-2">
+                      <div class="form-control">
+                        <label class="label">
+                          <span class="label-text text-xs">Pièce existante</span>
+                        </label>
+                        <select
+                          class="select select-bordered select-sm"
+                          :value="entry.pieceId || ''"
+                          @change="setPieceRequirementPiece(requirement, entryIndex, ($event.target && $event.target.value) || '')"
                         >
-                          {{ type.name }}
-                        </option>
-                      </select>
-                    </div>
-                    <div class="form-control">
-                      <label class="label">
-                        <span class="label-text text-xs">Nom de la pièce</span>
-                      </label>
-                      <input
-                        v-model="entry.definition.name"
-                        type="text"
-                        class="input input-bordered input-sm"
-                        placeholder="Nom de la pièce"
+                          <option value="">
+                            Sélectionner une pièce disponible
+                          </option>
+                          <option
+                            v-for="pieceOption in getPieceOptions(requirement, entry)"
+                            :key="pieceOption.id"
+                            :value="pieceOption.id"
+                          >
+                            {{ formatPieceOption(pieceOption) }}
+                          </option>
+                        </select>
+                      </div>
+                      <p
+                        v-if="getPieceOptions(requirement, entry).length === 0"
+                        class="text-xs text-error"
                       >
+                        Aucune pièce disponible pour cette famille.
+                      </p>
                     </div>
-                    <div class="form-control">
-                      <label class="label">
-                        <span class="label-text text-xs">Référence (optionnel)</span>
-                      </label>
-                      <input
-                        v-model="entry.definition.reference"
-                        type="text"
-                        class="input input-bordered input-sm"
-                        placeholder="Référence de la pièce"
-                      >
-                    </div>
-                    <div class="form-control">
-                      <label class="label">
-                        <span class="label-text text-xs">Constructeur (optionnel)</span>
-                      </label>
-                      <ConstructeurSelect
-                        class="w-full"
-                        :model-value="entry.definition.constructeurId || null"
-                        placeholder="Sélectionner un constructeur"
-                        @update:modelValue="(value) => setPieceRequirementConstructeur(requirement.id, entryIndex, value)"
-                      />
-                    </div>
-                    <div class="form-control">
-                      <label class="label">
-                        <span class="label-text text-xs">Prix (optionnel)</span>
-                      </label>
-                      <input
-                        v-model.number="entry.definition.prix"
-                        type="number"
-                        min="0"
-                        step="0.01"
-                        class="input input-bordered input-sm"
-                        placeholder="0.00"
+
+                    <div
+                      v-if="entry.pieceId"
+                      class="bg-base-300/60 rounded-md p-3 text-xs text-gray-600 space-y-1"
+                    >
+                      <div class="font-medium">
+                        {{ (findPieceById(entry.pieceId)?.name) || "Pièce" }}
+                      </div>
+                      <div>
+                        Référence : {{ findPieceById(entry.pieceId)?.reference || "—" }}
+                      </div>
+                      <div>
+                        Constructeur :
+                        {{ findPieceById(entry.pieceId)?.constructeur?.name || findPieceById(entry.pieceId)?.constructeurName || "—" }}
+                      </div>
+                      <div>
+                        Machine actuelle :
+                        {{ findPieceById(entry.pieceId)?.machine?.name || findPieceById(entry.pieceId)?.machineId || "Non affecté" }}
+                      </div>
+                      <div>
+                        Composant actuel :
+                        {{ findPieceById(entry.pieceId)?.composant?.name || findPieceById(entry.pieceId)?.composantId || "Non affecté" }}
+                      </div>
+                      <div
+                        v-if="findPieceById(entry.pieceId)?.machine?.name || findPieceById(entry.pieceId)?.composant?.name"
+                        class="text-warning mt-1"
                       >
+                        Cette pièce sera détachée de son affectation actuelle pendant la création.
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -597,14 +577,12 @@
 
 <script setup>
 import { ref, reactive, computed, watch, onMounted } from 'vue'
-import ConstructeurSelect from '~/components/ConstructeurSelect.vue'
 import { useMachines } from '~/composables/useMachines'
 import { useSites } from '~/composables/useSites'
 import { useMachineTypesApi } from '~/composables/useMachineTypesApi'
-import { useComponentTypes } from '~/composables/useComponentTypes'
-import { usePieceTypes } from '~/composables/usePieceTypes'
+import { useComposants } from '~/composables/useComposants'
+import { usePieces } from '~/composables/usePieces'
 import { useToast } from '~/composables/useToast'
-import { sanitizeDefinitionOverrides } from '~/shared/modelUtils'
 import IconLucidePlus from '~icons/lucide/plus'
 import IconLucideX from '~icons/lucide/x'
 import IconLucideEye from '~icons/lucide/eye'
@@ -615,8 +593,8 @@ import IconLucideCircle from '~icons/lucide/circle'
 const { createMachine, createMachineFromType } = useMachines()
 const { sites, loadSites } = useSites()
 const { machineTypes, loadMachineTypes } = useMachineTypesApi()
-const { componentTypes, loadComponentTypes } = useComponentTypes()
-const { pieceTypes, loadPieceTypes } = usePieceTypes()
+const { composants, loadComposants } = useComposants()
+const { pieces, loadPieces } = usePieces()
 const toast = useToast()
 
 const submitting = ref(false)
@@ -638,9 +616,177 @@ const selectedMachineType = computed(() => {
   return machineTypes.value.find(type => type.id === newMachine.typeMachineId) || null
 })
 
-const componentTypeOptions = computed(() => componentTypes.value || [])
-const pieceTypeOptions = computed(() => pieceTypes.value || [])
+const componentById = computed(() => {
+  const map = new Map()
+  ;(composants.value || []).forEach((component) => {
+    if (component?.id) {
+      map.set(component.id, component)
+    }
+  })
+  return map
+})
 
+const pieceById = computed(() => {
+  const map = new Map()
+  ;(pieces.value || []).forEach((piece) => {
+    if (piece?.id) {
+      map.set(piece.id, piece)
+    }
+  })
+  return map
+})
+
+const componentInventory = computed(() => composants.value || [])
+const pieceInventory = computed(() => pieces.value || [])
+
+const selectedComponentIds = computed(() => {
+  const ids = []
+  Object.values(componentRequirementSelections).forEach((entries) => {
+    ;(entries || []).forEach((entry) => {
+      if (entry?.composantId) {
+        ids.push(entry.composantId)
+      }
+    })
+  })
+  return ids
+})
+
+const selectedPieceIds = computed(() => {
+  const ids = []
+  Object.values(pieceRequirementSelections).forEach((entries) => {
+    ;(entries || []).forEach((entry) => {
+      if (entry?.pieceId) {
+        ids.push(entry.pieceId)
+      }
+    })
+  })
+  return ids
+})
+
+const getComponentOptions = (requirement, currentEntry) => {
+  const requirementTypeId = requirement?.typeComposantId || requirement?.typeComposant?.id || null
+  const usedIds = new Set(
+    selectedComponentIds.value.filter((id) => id && (!currentEntry || id !== currentEntry.composantId)),
+  )
+
+  return componentInventory.value.filter((component) => {
+    if (requirementTypeId && component.typeComposantId !== requirementTypeId) {
+      return false
+    }
+    if (!component.id) {
+      return false
+    }
+    if (currentEntry?.composantId === component.id) {
+      return true
+    }
+    return !usedIds.has(component.id)
+  })
+}
+
+const getPieceOptions = (requirement, currentEntry) => {
+  const requirementTypeId = requirement?.typePieceId || requirement?.typePiece?.id || null
+  const usedIds = new Set(
+    selectedPieceIds.value.filter((id) => id && (!currentEntry || id !== currentEntry.pieceId)),
+  )
+
+  return pieceInventory.value.filter((piece) => {
+    if (requirementTypeId && piece.typePieceId !== requirementTypeId) {
+      return false
+    }
+    if (!piece.id) {
+      return false
+    }
+    if (currentEntry?.pieceId === piece.id) {
+      return true
+    }
+    return !usedIds.has(piece.id)
+  })
+}
+
+const formatComponentOption = (component) => {
+  if (!component) {
+    return ''
+  }
+  const parts = [component.name || 'Composant']
+  if (component.reference) {
+    parts.push(`Réf. ${component.reference}`)
+  }
+  const constructeurName = component.constructeur?.name || component.constructeurName
+  if (constructeurName) {
+    parts.push(constructeurName)
+  }
+  if (component.machine?.name) {
+    parts.push(`Machine: ${component.machine.name}`)
+  } else if (component.machineId) {
+    parts.push(`Machine: ${component.machineId}`)
+  }
+  return parts.join(' • ')
+}
+
+const formatPieceOption = (piece) => {
+  if (!piece) {
+    return ''
+  }
+  const parts = [piece.name || 'Pièce']
+  if (piece.reference) {
+    parts.push(`Réf. ${piece.reference}`)
+  }
+  const constructeurName = piece.constructeur?.name || piece.constructeurName
+  if (constructeurName) {
+    parts.push(constructeurName)
+  }
+  if (piece.machine?.name) {
+    parts.push(`Machine: ${piece.machine.name}`)
+  } else if (piece.machineId) {
+    parts.push(`Machine: ${piece.machineId}`)
+  }
+  if (piece.composant?.name) {
+    parts.push(`Composant: ${piece.composant.name}`)
+  } else if (piece.composantId) {
+    parts.push(`Composant: ${piece.composantId}`)
+  }
+  return parts.join(' • ')
+}
+
+const setComponentRequirementComponent = (requirement, index, componentId) => {
+  const entries = getComponentRequirementEntries(requirement.id)
+  const entry = entries[index]
+  if (!entry) return
+  entry.composantId = componentId || null
+  if (componentId) {
+    const component = findComponentById(componentId)
+    entry.typeComposantId = component?.typeComposantId || requirement?.typeComposantId || null
+  } else {
+    entry.typeComposantId = requirement?.typeComposantId || null
+  }
+}
+
+const setPieceRequirementPiece = (requirement, index, pieceId) => {
+  const entries = getPieceRequirementEntries(requirement.id)
+  const entry = entries[index]
+  if (!entry) return
+  entry.pieceId = pieceId || null
+  if (pieceId) {
+    const piece = findPieceById(pieceId)
+    entry.typePieceId = piece?.typePieceId || requirement?.typePieceId || null
+  } else {
+    entry.typePieceId = requirement?.typePieceId || null
+  }
+}
+
+const findComponentById = (id) => {
+  if (!id) {
+    return null
+  }
+  return componentById.value.get(id) || null
+}
+
+const findPieceById = (id) => {
+  if (!id) {
+    return null
+  }
+  return pieceById.value.get(id) || null
+}
 const getStatusBadgeClass = (status) => {
   if (status === 'ready') {
     return 'badge-success'
@@ -651,89 +797,39 @@ const getStatusBadgeClass = (status) => {
   return 'badge-error'
 }
 
-const componentTypeLabelMap = computed(() => {
-  const map = new Map()
-  componentTypeOptions.value.forEach((type) => {
-    if (type?.id) {
-      map.set(type.id, type.name || '')
-    }
-  })
-  const requirementTypes = selectedMachineType.value?.componentRequirements || []
-  requirementTypes.forEach((requirement) => {
-    const type = requirement?.typeComposant
-    if (type?.id && type?.name) {
-      map.set(type.id, type.name)
-    }
-  })
-  return map
-})
-
-const pieceTypeLabelMap = computed(() => {
-  const map = new Map()
-  pieceTypeOptions.value.forEach((type) => {
-    if (type?.id) {
-      map.set(type.id, type.name || '')
-    }
-  })
-  const requirementTypes = selectedMachineType.value?.pieceRequirements || []
-  requirementTypes.forEach((requirement) => {
-    const type = requirement?.typePiece
-    if (type?.id && type?.name) {
-      map.set(type.id, type.name)
-    }
-  })
-  return map
-})
-
 const resolveComponentRequirementTypeLabel = (requirement, entry) => {
-  const typeId = entry?.typeComposantId || requirement?.typeComposantId || null
-  if (!typeId) {
-    return requirement?.typeComposant?.name || 'Type non défini'
+  if (entry?.composantId) {
+    const component = findComponentById(entry.composantId)
+    if (component?.typeComposant?.name) {
+      return component.typeComposant.name
+    }
   }
-  return componentTypeLabelMap.value.get(typeId) || requirement?.typeComposant?.name || 'Type non défini'
+  return requirement?.typeComposant?.name || 'Type non défini'
 }
 
 const resolvePieceRequirementTypeLabel = (requirement, entry) => {
-  const typeId = entry?.typePieceId || requirement?.typePieceId || null
-  if (!typeId) {
-    return requirement?.typePiece?.name || 'Type non défini'
+  if (entry?.pieceId) {
+    const piece = findPieceById(entry.pieceId)
+    if (piece?.typePiece?.name) {
+      return piece.typePiece.name
+    }
   }
-  return pieceTypeLabelMap.value.get(typeId) || requirement?.typePiece?.name || 'Type non défini'
+  return requirement?.typePiece?.name || 'Type non défini'
 }
 
 const getComponentRequirementEntries = requirementId => componentRequirementSelections[requirementId] || []
 const getPieceRequirementEntries = requirementId => pieceRequirementSelections[requirementId] || []
 
 const createComponentSelectionEntry = (requirement, source = null) => ({
-  typeComposantId: source?.typeComposantId
-    || source?.typeComposant?.id
-    || requirement?.typeComposantId
-    || null,
-  definition: {
-    name:
-      (typeof source?.name === 'string' ? source.name : null)
-      || requirement?.typeComposant?.name
-      || '',
-    reference: source?.reference || '',
-    constructeurId: source?.constructeurId || source?.constructeur?.id || null,
-    prix: source?.prix ?? source?.price ?? null,
-  },
+  typeComposantId: requirement?.typeComposantId || requirement?.typeComposant?.id || null,
+  composantId: source?.composantId || null,
+  definition: {},
 })
 
 const createPieceSelectionEntry = (requirement, source = null) => ({
-  typePieceId: source?.typePieceId
-    || source?.typePiece?.id
-    || requirement?.typePieceId
-    || null,
-  definition: {
-    name:
-      (typeof source?.name === 'string' ? source.name : null)
-      || requirement?.typePiece?.name
-      || '',
-    reference: source?.reference || '',
-    constructeurId: source?.constructeurId || source?.constructeur?.id || null,
-    prix: source?.prix ?? source?.price ?? null,
-  },
+  typePieceId: requirement?.typePieceId || requirement?.typePiece?.id || null,
+  pieceId: source?.pieceId || null,
+  definition: {},
 })
 
 const clearRequirementSelections = () => {
@@ -763,20 +859,6 @@ const removeComponentSelectionEntry = (requirementId, index) => {
   componentRequirementSelections[requirementId] = entries.filter((_, i) => i !== index)
 }
 
-const setComponentRequirementType = (requirementId, index, value) => {
-  const entries = getComponentRequirementEntries(requirementId)
-  const entry = entries[index]
-  if (!entry) return
-  entry.typeComposantId = value || null
-}
-
-const setComponentRequirementConstructeur = (requirementId, index, value) => {
-  const entries = getComponentRequirementEntries(requirementId)
-  const entry = entries[index]
-  if (!entry) return
-  entry.definition.constructeurId = value || null
-}
-
 const addPieceSelectionEntry = (requirement) => {
   const entries = getPieceRequirementEntries(requirement.id)
   const max = requirement.maxCount ?? null
@@ -795,20 +877,6 @@ const removePieceSelectionEntry = (requirementId, index) => {
   pieceRequirementSelections[requirementId] = entries.filter((_, i) => i !== index)
 }
 
-const setPieceRequirementType = (requirementId, index, value) => {
-  const entries = getPieceRequirementEntries(requirementId)
-  const entry = entries[index]
-  if (!entry) return
-  entry.typePieceId = value || null
-}
-
-const setPieceRequirementConstructeur = (requirementId, index, value) => {
-  const entries = getPieceRequirementEntries(requirementId)
-  const entry = entries[index]
-  if (!entry) return
-  entry.definition.constructeurId = value || null
-}
-
 const validateRequirementSelections = (type) => {
   const errors = []
   const componentSelectionsPayload = []
@@ -828,23 +896,41 @@ const validateRequirementSelections = (type) => {
     }
 
     entries.forEach((entry) => {
-      const resolvedTypeId = entry.typeComposantId || requirement.typeComposantId || null
-      if (!resolvedTypeId) {
-        errors.push(`Le groupe "${requirement.label || requirement.typeComposant?.name || 'Composants'}" nécessite un type de composant.`)
+      if (!entry.composantId) {
+        errors.push(`Sélectionner un composant existant pour "${requirement.label || requirement.typeComposant?.name || 'Composants'}".`)
         return
       }
 
-      const payload = { requirementId: requirement.id }
-      if (entry.typeComposantId && entry.typeComposantId !== requirement.typeComposantId) {
-        payload.typeComposantId = entry.typeComposantId
+      const component = findComponentById(entry.composantId)
+      if (!component) {
+        errors.push(`Le composant sélectionné est introuvable (ID: ${entry.composantId}).`)
+        return
       }
 
-      const overrides = sanitizeDefinitionOverrides(entry.definition)
-      if (overrides) {
-        payload.definition = overrides
+      if (component.machineId) {
+        errors.push(`Le composant "${component.name || component.id}" est déjà affecté à une machine.`)
+        return
       }
 
-      componentSelectionsPayload.push(payload)
+      if (component.parentComposantId) {
+        errors.push(`Le composant "${component.name || component.id}" est déjà rattaché à un autre composant.`)
+        return
+      }
+
+      const requiredTypeId = requirement.typeComposantId || requirement.typeComposant?.id || null
+      if (
+        requiredTypeId &&
+        component.typeComposantId &&
+        component.typeComposantId !== requiredTypeId
+      ) {
+        errors.push(`Le composant "${component.name || component.id}" n'appartient pas à la famille attendue.`)
+        return
+      }
+
+      componentSelectionsPayload.push({
+        requirementId: requirement.id,
+        composantId: entry.composantId,
+      })
     })
   }
 
@@ -862,23 +948,36 @@ const validateRequirementSelections = (type) => {
     }
 
     entries.forEach((entry) => {
-      const resolvedTypeId = entry.typePieceId || requirement.typePieceId || null
-      if (!resolvedTypeId) {
-        errors.push(`Le groupe "${requirement.label || requirement.typePiece?.name || 'Pièces'}" nécessite un type de pièce.`)
+      if (!entry.pieceId) {
+        errors.push(`Sélectionner une pièce existante pour "${requirement.label || requirement.typePiece?.name || 'Pièces'}".`)
         return
       }
 
-      const payload = { requirementId: requirement.id }
-      if (entry.typePieceId && entry.typePieceId !== requirement.typePieceId) {
-        payload.typePieceId = entry.typePieceId
+      const piece = findPieceById(entry.pieceId)
+      if (!piece) {
+        errors.push(`La pièce sélectionnée est introuvable (ID: ${entry.pieceId}).`)
+        return
       }
 
-      const overrides = sanitizeDefinitionOverrides(entry.definition)
-      if (overrides) {
-        payload.definition = overrides
+      if (piece.machineId || piece.composantId) {
+        errors.push(`La pièce "${piece.name || piece.id}" est déjà affectée.`)
+        return
       }
 
-      pieceSelectionsPayload.push(payload)
+      const requiredTypeId = requirement.typePieceId || requirement.typePiece?.id || null
+      if (
+        requiredTypeId &&
+        piece.typePieceId &&
+        piece.typePieceId !== requiredTypeId
+      ) {
+        errors.push(`La pièce "${piece.name || piece.id}" n'appartient pas à la famille attendue.`)
+        return
+      }
+
+      pieceSelectionsPayload.push({
+        requirementId: requirement.id,
+        pieceId: entry.pieceId,
+      })
     })
   }
 
@@ -945,16 +1044,22 @@ const machinePreview = computed(() => {
   const componentGroups = (type.componentRequirements || []).map((requirement) => {
     const entries = getComponentRequirementEntries(requirement.id)
     const normalizedEntries = entries.map((entry, index) => {
-      const overrides = sanitizeDefinitionOverrides(entry.definition)
-      const fallbackName = requirement.typeComposant?.name || 'Composant'
-      const rawName = typeof entry.definition?.name === 'string' ? entry.definition.name.trim() : ''
-      const displayName = overrides?.name || rawName || fallbackName
+      const selectedComponent = entry.composantId
+        ? findComponentById(entry.composantId)
+        : null
+      const displayName = selectedComponent?.name
+        || requirement.typeComposant?.name
+        || 'Composant'
 
       const subtitleParts = []
-      if (overrides?.reference) {
-        subtitleParts.push(`Réf. ${overrides.reference}`)
+      if (selectedComponent?.reference) {
+        subtitleParts.push(`Réf. ${selectedComponent.reference}`)
       }
-      const status = entry.typeComposantId || requirement.typeComposantId ? 'complete' : 'pending'
+      const constructeurName = selectedComponent?.constructeur?.name || selectedComponent?.constructeurName
+      if (constructeurName) {
+        subtitleParts.push(constructeurName)
+      }
+      const status = entry.composantId ? 'complete' : 'pending'
 
       return {
         key: `${requirement.id}-${index}`,
@@ -978,7 +1083,7 @@ const machinePreview = computed(() => {
     }
 
     if (normalizedEntries.some(entry => entry.status !== 'complete')) {
-      issues.push({ message: 'Sélectionner un type pour chaque composant.', kind: 'error', anchor: `component-group-${requirement.id}` })
+      issues.push({ message: 'Sélectionner un composant pour chaque entrée.', kind: 'error', anchor: `component-group-${requirement.id}` })
     }
 
     const status = issues.some(issue => issue.kind === 'error')
@@ -1004,16 +1109,18 @@ const machinePreview = computed(() => {
   const pieceGroups = (type.pieceRequirements || []).map((requirement) => {
     const entries = getPieceRequirementEntries(requirement.id)
     const normalizedEntries = entries.map((entry, index) => {
-      const overrides = sanitizeDefinitionOverrides(entry.definition)
-      const fallbackName = requirement.typePiece?.name || 'Pièce'
-      const rawName = typeof entry.definition?.name === 'string' ? entry.definition.name.trim() : ''
-      const displayName = overrides?.name || rawName || fallbackName
+      const selectedPiece = entry.pieceId ? findPieceById(entry.pieceId) : null
+      const displayName = selectedPiece?.name || requirement.typePiece?.name || 'Pièce'
 
       const subtitleParts = []
-      if (overrides?.reference) {
-        subtitleParts.push(`Réf. ${overrides.reference}`)
+      if (selectedPiece?.reference) {
+        subtitleParts.push(`Réf. ${selectedPiece.reference}`)
       }
-      const status = entry.typePieceId || requirement.typePieceId ? 'complete' : 'pending'
+      const constructeurName = selectedPiece?.constructeur?.name || selectedPiece?.constructeurName
+      if (constructeurName) {
+        subtitleParts.push(constructeurName)
+      }
+      const status = entry.pieceId ? 'complete' : 'pending'
 
       return {
         key: `${requirement.id}-${index}`,
@@ -1037,7 +1144,7 @@ const machinePreview = computed(() => {
     }
 
     if (normalizedEntries.some(entry => entry.status !== 'complete')) {
-      issues.push({ message: 'Sélectionner un type pour chaque pièce.', kind: 'error', anchor: `piece-group-${requirement.id}` })
+      issues.push({ message: 'Sélectionner une pièce pour chaque entrée.', kind: 'error', anchor: `piece-group-${requirement.id}` })
     }
 
     const status = issues.some(issue => issue.kind === 'error')
@@ -1251,8 +1358,8 @@ onMounted(async () => {
   await Promise.all([
     loadSites(),
     loadMachineTypes(),
-    loadComponentTypes(),
-    loadPieceTypes()
+    loadComposants(),
+    loadPieces()
   ])
 })
 </script>
diff --git a/app/pages/pieces-catalog.vue b/app/pages/pieces-catalog.vue
index 713f36c..94988de 100644
--- a/app/pages/pieces-catalog.vue
+++ b/app/pages/pieces-catalog.vue
@@ -4,501 +4,76 @@
       <div>
         <h1 class="text-3xl font-semibold text-base-content">Catalogue des pièces</h1>
         <p class="text-sm text-gray-500">
-          Consultez les catégories disponibles et instanciez des pièces à partir de leur squelette canonique.
+          Consultez et gérez toutes les pièces existantes.
         </p>
       </div>
-      <NuxtLink to="/piece-category" class="btn btn-outline btn-sm md:btn-md self-start">
-        Gérer les catégories
-      </NuxtLink>
+      <div class="flex flex-wrap gap-2">
+        <NuxtLink to="/pieces/create" class="btn btn-primary btn-sm md:btn-md">
+          Ajouter une pièce
+        </NuxtLink>
+        <NuxtLink to="/piece-category" class="btn btn-outline btn-sm md:btn-md">
+          Gérer les catégories
+        </NuxtLink>
+      </div>
     </header>
+    <section class="card border border-base-200 bg-base-100 shadow-sm">
+      <div class="card-body space-y-4">
+        <header class="flex flex-col gap-2">
+          <h2 class="text-xl font-semibold text-base-content">Pièces créées</h2>
+          <p class="text-sm text-base-content/70">
+            Liste globale des pièces enregistrées, quel que soit leur squelette d'origine.
+          </p>
+        </header>
 
-    <section>
-      <div v-if="loadingTypes" class="flex justify-center py-16">
-        <span class="loading loading-spinner loading-lg" aria-hidden="true" />
-      </div>
+        <div v-if="loadingPieces" class="flex justify-center py-8">
+          <span class="loading loading-spinner" aria-hidden="true" />
+        </div>
 
-      <template v-else>
-        <p v-if="!pieceTypeList.length" class="text-sm text-gray-500">
-          Aucune catégorie de pièce n'est disponible pour le moment. Créez des catégories dans la gestion dédiée pour définir vos squelettes.
+        <p v-else-if="!piecesList.length" class="text-sm text-base-content/70">
+          Aucune pièce n'a encore été créée.
         </p>
 
-        <div v-else class="grid gap-6 lg:grid-cols-2">
-          <article
-            v-for="type in pieceTypeList"
-            :key="type.id"
-            class="card bg-base-100 border border-base-200 shadow-sm"
-          >
-            <div class="card-body space-y-4">
-              <div class="flex flex-col gap-3 md:flex-row md:items-start md:justify-between">
-                <div class="space-y-1">
-                  <h2 class="card-title text-xl">{{ type.name }}</h2>
-                  <p v-if="type.description" class="text-sm text-gray-500">
-                    {{ type.description }}
-                  </p>
-                </div>
-
-                <button type="button" class="btn btn-primary btn-sm md:btn-md self-start" @click="openCreationModal(type)">
-                  Instancier une pièce
-                </button>
-              </div>
-
-              <div class="flex flex-wrap gap-2 text-xs text-gray-500">
-                <span class="badge badge-outline">{{ formatPieceStructurePreview(type.structure) }}</span>
-                <span v-if="getCategoryCustomFields(type).length" class="badge badge-outline">
-                  {{ getCategoryCustomFields(type).length }} champ(s) personnalisés
-                </span>
-              </div>
-
-              <div v-if="type.structure" class="space-y-3">
-                <details class="collapse collapse-arrow bg-base-200/60">
-                  <summary class="collapse-title text-sm font-medium">
-                    Détails du squelette
-                  </summary>
-                  <div class="collapse-content space-y-3 text-sm text-base-content/80">
-                    <div v-if="getStructureCustomFields(type.structure).length" class="space-y-1">
-                      <h3 class="font-semibold text-sm text-base-content">Valeurs par défaut</h3>
-                      <ul class="list-disc list-inside space-y-1">
-                        <li
-                          v-for="field in getStructureCustomFields(type.structure)"
-                          :key="field.name"
-                        >
-                          <span class="font-medium">{{ field.name }}</span>
-                          <span v-if="field.value !== undefined && field.value !== null"> : {{ field.value }}</span>
-                        </li>
-                      </ul>
-                    </div>
-
-                    <p
-                      v-if="!getStructureCustomFields(type.structure).length"
-                      class="text-xs text-gray-500"
-                    >
-                      Ce squelette ne définit pas encore de valeurs par défaut spécifiques.
-                    </p>
-                  </div>
-                </details>
-              </div>
-
-              <div v-if="getCategoryCustomFields(type).length" class="space-y-2">
-                <h3 class="text-sm font-semibold text-base-content">Champs personnalisés de la catégorie</h3>
-                <ul class="space-y-1 text-sm text-base-content/80">
-                  <li
-                    v-for="field in getCategoryCustomFields(type)"
-                    :key="field.id || field.name"
-                    class="flex flex-wrap gap-2 items-center"
+        <div v-else class="overflow-x-auto">
+          <table class="table table-sm md:table-md">
+            <thead>
+              <tr>
+                <th>Nom</th>
+                <th>Catégorie</th>
+                <th>Référence</th>
+                <th>Actions</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="piece in piecesList" :key="piece.id">
+                <td>{{ piece.name || 'Pièce sans nom' }}</td>
+                <td>{{ piece.typePiece?.name || '—' }}</td>
+                <td>{{ piece.reference || '—' }}</td>
+                <td>
+                  <NuxtLink
+                    :to="`/pieces/${piece.id}/edit`"
+                    class="btn btn-ghost btn-xs"
                   >
-                    <span class="font-medium">{{ field.name }}</span>
-                    <span class="badge badge-outline badge-xs">{{ field.type || 'text' }}</span>
-                    <span v-if="field.required" class="badge badge-outline badge-xs badge-error">Obligatoire</span>
-                  </li>
-                </ul>
-              </div>
-
-              <div v-if="getExistingPieces(type).length" class="space-y-2">
-                <h3 class="text-sm font-semibold text-base-content">Pièces existantes</h3>
-                <ul class="space-y-1 text-sm text-base-content/80">
-                  <li
-                    v-for="piece in getExistingPieces(type).slice(0, 5)"
-                    :key="piece.id"
-                  >
-                    <span class="font-medium">{{ piece.name || 'Pièce sans nom' }}</span>
-                    <span v-if="piece.machine?.name" class="text-xs text-gray-500">
-                      · Machine : {{ piece.machine.name }}
-                    </span>
-                  </li>
-                </ul>
-                <p
-                  v-if="getExistingPieces(type).length > 5"
-                  class="text-xs text-gray-500"
-                >
-                  + {{ getExistingPieces(type).length - 5 }} pièce(s) supplémentaires.
-                </p>
-              </div>
-            </div>
-          </article>
+                    Modifier
+                  </NuxtLink>
+                </td>
+              </tr>
+            </tbody>
+          </table>
         </div>
-      </template>
+      </div>
     </section>
   </main>
 
-  <Teleport to="body">
-    <div v-if="creationModalOpen" class="modal modal-open">
-      <div class="modal-box max-w-3xl space-y-6">
-        <div class="space-y-1">
-          <h3 class="text-lg font-semibold">
-            Instancier une pièce
-          </h3>
-          <p class="text-sm text-gray-500">
-            Sélectionnez la machine et le requirement cible puis ajustez les informations d'override avant la création.
-          </p>
-          <p v-if="selectedType" class="badge badge-outline badge-sm">
-            Catégorie : {{ selectedType.name }}
-          </p>
-        </div>
-
-        <form class="space-y-4" @submit.prevent="submitCreation">
-          <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-            <div class="form-control">
-              <label class="label">
-                <span class="label-text">Machine cible</span>
-              </label>
-              <select
-                v-model="creationForm.machineId"
-                class="select select-bordered select-sm md:select-md"
-                :disabled="machinesLoading || submitting"
-                required
-              >
-                <option value="">Sélectionner une machine</option>
-                <option
-                  v-for="machine in machines"
-                  :key="machine.id"
-                  :value="machine.id"
-                >
-                  {{ machine.name }}
-                </option>
-              </select>
-              <p v-if="machinesLoading" class="text-xs text-gray-500 mt-1">
-                Chargement des machines...
-              </p>
-            </div>
-
-            <div class="form-control">
-              <label class="label">
-                <span class="label-text">Requirement</span>
-              </label>
-              <select
-                v-model="creationForm.requirementId"
-                class="select select-bordered select-sm md:select-md"
-                :disabled="requirementLoading || !requirementOptions.length || submitting"
-                required
-              >
-                <option value="">Sélectionner un requirement</option>
-                <option
-                  v-for="requirement in requirementOptions"
-                  :key="requirement.id"
-                  :value="requirement.id"
-                >
-                  {{ resolveRequirementLabel(requirement) }}
-                </option>
-              </select>
-              <p v-if="requirementLoading" class="text-xs text-gray-500 mt-1">
-                Chargement des requirements de la machine...
-              </p>
-              <p
-                v-else-if="creationForm.machineId && !requirementOptions.length"
-                class="text-xs text-error mt-1"
-              >
-                Cette machine n'a pas de requirement de pièce configuré.
-              </p>
-            </div>
-          </div>
-
-          <div
-            v-if="selectedRequirement"
-            class="rounded-lg border border-base-200 bg-base-200/60 p-4 text-xs text-base-content/80 space-y-1"
-          >
-            <div class="flex flex-wrap gap-2 items-center">
-              <span class="font-medium text-sm">Requirement sélectionné :</span>
-              <span class="badge badge-outline badge-sm">{{ resolveRequirementLabel(selectedRequirement) }}</span>
-            </div>
-            <p v-if="selectedRequirement.typePiece?.name" class="text-xs">
-              Type attendu : {{ selectedRequirement.typePiece.name }}
-            </p>
-            <p v-if="selectedRequirement.maxCount !== null && selectedRequirement.maxCount !== undefined" class="text-xs">
-              Capacité : {{ selectedRequirement.minCount ?? (selectedRequirement.required ? 1 : 0) }} -
-              {{ selectedRequirement.maxCount ?? '∞' }} élément(s)
-            </p>
-          </div>
-
-          <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-            <div class="form-control">
-              <label class="label">
-                <span class="label-text">Nom de la pièce</span>
-              </label>
-              <input
-                v-model="creationForm.name"
-                type="text"
-                class="input input-bordered input-sm md:input-md"
-                :disabled="submitting"
-                placeholder="Nom affiché après instanciation"
-              >
-            </div>
-
-            <div class="form-control">
-              <label class="label">
-                <span class="label-text">Référence</span>
-              </label>
-              <input
-                v-model="creationForm.reference"
-                type="text"
-                class="input input-bordered input-sm md:input-md"
-                :disabled="submitting"
-                placeholder="Référence interne ou constructeur"
-              >
-            </div>
-
-            <div class="form-control">
-              <label class="label">
-                <span class="label-text">Constructeur</span>
-              </label>
-              <ConstructeurSelect
-                v-model="creationForm.constructeurId"
-                class="w-full"
-                :disabled="submitting"
-                placeholder="Rechercher un constructeur..."
-              />
-            </div>
-
-            <div class="form-control">
-              <label class="label">
-                <span class="label-text">Prix</span>
-              </label>
-              <input
-                v-model="creationForm.prix"
-                type="number"
-                step="0.01"
-                min="0"
-                class="input input-bordered input-sm md:input-md"
-                :disabled="submitting"
-                placeholder="Valeur indicative (€)"
-              >
-            </div>
-          </div>
-        </form>
-
-        <div class="modal-action">
-          <button type="button" class="btn btn-ghost" :disabled="submitting" @click="closeCreationModal">
-            Annuler
-          </button>
-          <button
-            type="button"
-            class="btn btn-primary"
-            :disabled="!canSubmit"
-            @click="submitCreation"
-          >
-            <span v-if="submitting" class="loading loading-spinner loading-sm mr-2"></span>
-            Créer la pièce
-          </button>
-        </div>
-      </div>
-      <button class="modal-backdrop" aria-label="Fermer" @click="closeCreationModal"></button>
-    </div>
-  </Teleport>
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted, reactive, ref, watch } from 'vue'
-import ConstructeurSelect from '~/components/ConstructeurSelect.vue'
-import { usePieceTypes } from '~/composables/usePieceTypes'
-import { useMachines } from '~/composables/useMachines'
+import { computed, onMounted } from 'vue'
 import { usePieces } from '~/composables/usePieces'
-import { useToast } from '~/composables/useToast'
-import { useApi } from '~/composables/useApi'
-import { formatPieceStructurePreview, sanitizeDefinitionOverrides } from '~/shared/modelUtils'
-import type { PieceModelStructure } from '~/shared/types/inventory'
-import type { ModelType } from '~/services/modelTypes'
-
-interface PieceCatalogType extends ModelType {
-  structure: PieceModelStructure | null
-  customFields?: Array<Record<string, any>>
-  pieces?: Array<Record<string, any>>
-}
-
-const { pieceTypes, loadPieceTypes, loadingPieceTypes } = usePieceTypes()
-const { machines, loadMachines, loading: machinesLoadingRef } = useMachines()
-const { createPiece } = usePieces()
-const toast = useToast()
-const { apiCall } = useApi()
-
-const creationModalOpen = ref(false)
-const selectedType = ref<PieceCatalogType | null>(null)
-const submitting = ref(false)
-const requirementLoading = ref(false)
-const creationForm = reactive({
-  machineId: '' as string,
-  requirementId: '' as string,
-  name: '' as string,
-  reference: '' as string,
-  constructeurId: null as string | null,
-  prix: '' as string,
-})
-
-const machineRequirementCache = reactive<Record<string, { requirements: any[] }>>({})
-const lastSuggestedName = ref('')
-let requirementRequestToken = 0
-
-const loadingTypes = computed(() => loadingPieceTypes.value)
-const pieceTypeList = computed<PieceCatalogType[]>(() => (pieceTypes.value || []) as PieceCatalogType[])
-const machinesLoading = computed(() => machinesLoadingRef.value)
-
-const requirementOptions = computed(() => {
-  const machineId = creationForm.machineId
-  if (!machineId) {
-    return []
-  }
-  const entry = machineRequirementCache[machineId]
-  if (!entry) {
-    return []
-  }
-  return Array.isArray(entry.requirements) ? entry.requirements : []
-})
-
-const selectedRequirement = computed(() => {
-  return requirementOptions.value.find((requirement: any) => requirement.id === creationForm.requirementId) || null
-})
-
-const canSubmit = computed(() => Boolean(creationForm.machineId && creationForm.requirementId && !submitting.value && !requirementLoading.value))
-
-const getCategoryCustomFields = (type: PieceCatalogType) => Array.isArray(type?.customFields) ? type.customFields : []
-const getStructureCustomFields = (structure: PieceModelStructure | null) => Array.isArray(structure?.customFields) ? structure.customFields : []
-const getExistingPieces = (type: PieceCatalogType) => Array.isArray(type?.pieces) ? type.pieces : []
-
-const resolveRequirementLabel = (requirement: any) => {
-  if (!requirement) {
-    return 'Requirement sans libellé'
-  }
-  const parts: string[] = []
-  if (requirement.label) {
-    parts.push(requirement.label)
-  }
-  if (requirement.typePiece?.name) {
-    parts.push(requirement.typePiece.name)
-  }
-  return parts.join(' • ') || 'Requirement'
-}
-
-const clearCreationForm = () => {
-  creationForm.machineId = ''
-  creationForm.requirementId = ''
-  creationForm.name = ''
-  creationForm.reference = ''
-  creationForm.constructeurId = null
-  creationForm.prix = ''
-  lastSuggestedName.value = ''
-}
-
-const resetCreationFormForType = () => {
-  clearCreationForm()
-  creationForm.name = selectedType.value?.name || ''
-  lastSuggestedName.value = creationForm.name
-}
-
-const openCreationModal = async (type: PieceCatalogType) => {
-  selectedType.value = type
-  resetCreationFormForType()
-  creationModalOpen.value = true
-  if (!machines.value?.length) {
-    await loadMachines()
-  }
-}
-
-const closeCreationModal = () => {
-  creationModalOpen.value = false
-  selectedType.value = null
-  clearCreationForm()
-}
-
-const ensureMachineRequirements = async (machineId: string) => {
-  if (!machineId || machineRequirementCache[machineId]) {
-    return
-  }
-
-  const requestId = ++requirementRequestToken
-  requirementLoading.value = true
-  try {
-    const result = await apiCall(`/machines/${machineId}`, { method: 'GET' })
-    if (result.success) {
-      const requirements = result.data?.typeMachine?.pieceRequirements || []
-      machineRequirementCache[machineId] = { requirements }
-    }
-  } finally {
-    if (requestId === requirementRequestToken) {
-      requirementLoading.value = false
-    }
-  }
-}
-
-watch(
-  () => creationForm.machineId,
-  async (machineId) => {
-    creationForm.requirementId = ''
-    if (!machineId) {
-      return
-    }
-    await ensureMachineRequirements(machineId)
-  },
-)
-
-watch(
-  () => creationForm.requirementId,
-  (requirementId) => {
-    if (!selectedType.value) {
-      return
-    }
-    const requirement = requirementId ? selectedRequirement.value : null
-    const suggestion =
-      requirement?.label || requirement?.typePiece?.name || selectedType.value?.name || ''
-
-    if (!creationForm.name || creationForm.name === lastSuggestedName.value) {
-      creationForm.name = suggestion
-    }
-    lastSuggestedName.value = suggestion
-  },
-)
-
-const submitCreation = async () => {
-  if (!creationForm.machineId || !creationForm.requirementId) {
-    toast.showError('Sélectionnez une machine et un requirement avant de continuer.')
-    return
-  }
-  if (!selectedType.value) {
-    toast.showError('Aucune catégorie sélectionnée.')
-    return
-  }
-
-  const payload: Record<string, any> = {
-    machineId: creationForm.machineId,
-    typeMachinePieceRequirementId: creationForm.requirementId,
-  }
-
-  const requirement = selectedRequirement.value
-  if (selectedType.value.id) {
-    const requirementTypeId = requirement?.typePieceId || null
-    if (!requirementTypeId || requirementTypeId !== selectedType.value.id) {
-      payload.typePieceId = selectedType.value.id
-    }
-  }
-
-  const overrides = sanitizeDefinitionOverrides({
-    name: creationForm.name,
-    reference: creationForm.reference,
-    constructeurId: creationForm.constructeurId,
-    prix: creationForm.prix,
-  })
-
-  if (overrides) {
-    payload.definition = overrides
-  }
-
-  submitting.value = true
-  try {
-    const result = await createPiece(payload)
-    if (result.success) {
-      await loadPieceTypes()
-      closeCreationModal()
-    } else if (result.error) {
-      toast.showError(result.error)
-    }
-  } catch (error: any) {
-    toast.showError(error?.message || 'Erreur lors de la création de la pièce')
-  } finally {
-    submitting.value = false
-  }
-}
+const { pieces, loadPieces, loading: loadingPiecesRef } = usePieces()
+const loadingPieces = computed(() => loadingPiecesRef.value)
+const piecesList = computed(() => pieces.value || [])
 
 onMounted(async () => {
-  await Promise.allSettled([
-    loadPieceTypes(),
-    loadMachines(),
-  ])
+  await loadPieces()
 })
 </script>
diff --git a/app/pages/pieces/[id]/edit.vue b/app/pages/pieces/[id]/edit.vue
new file mode 100644
index 0000000..d3808a2
--- /dev/null
+++ b/app/pages/pieces/[id]/edit.vue
@@ -0,0 +1,641 @@
+<template>
+  <main class="container mx-auto px-6 py-10">
+    <div v-if="loading" class="flex flex-col items-center gap-4 py-20 text-center">
+      <span class="loading loading-spinner loading-lg" aria-hidden="true" />
+      <p class="text-sm text-base-content/70">Chargement de la pièce…</p>
+    </div>
+
+    <div v-else-if="!piece" class="max-w-xl mx-auto">
+      <div class="alert alert-error shadow-lg">
+        <div>
+          <h2 class="font-semibold text-lg">Pièce introuvable</h2>
+          <p class="text-sm text-base-content/80">
+            Nous n'avons pas pu retrouver la pièce demandée. Elle a peut-être été supprimée.
+          </p>
+        </div>
+      </div>
+      <NuxtLink to="/pieces-catalog" class="btn btn-primary mt-6">
+        Retour au catalogue
+      </NuxtLink>
+    </div>
+
+    <section v-else class="card border border-base-200 bg-base-100 shadow-sm max-w-5xl mx-auto">
+      <div class="card-body space-y-6">
+        <header class="flex flex-col gap-2 md:flex-row md:items-center md:justify-between">
+          <div>
+            <h1 class="text-3xl font-semibold text-base-content">Modifier la pièce</h1>
+            <p class="text-sm text-base-content/70">
+              Ajustez les informations de la pièce et ses champs personnalisés.
+            </p>
+          </div>
+          <NuxtLink to="/pieces-catalog" class="btn btn-ghost btn-sm md:btn-md self-start">
+            Retour au catalogue
+          </NuxtLink>
+        </header>
+
+        <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+          <div class="form-control">
+            <label class="label">
+              <span class="label-text">Catégorie de pièce</span>
+            </label>
+            <select
+              v-model="selectedTypeId"
+              class="select select-bordered select-sm md:select-md"
+              disabled
+            >
+              <option value="">Sélectionner une catégorie</option>
+              <option
+                v-for="type in pieceTypeList"
+                :key="type.id"
+                :value="type.id"
+              >
+                {{ type.name }}
+              </option>
+            </select>
+            <p class="text-xs text-base-content/60 mt-1">
+              La catégorie d'origine ne peut pas être modifiée depuis cette page.
+            </p>
+          </div>
+        </div>
+
+        <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+          <div class="form-control">
+            <label class="label">
+              <span class="label-text">Nom de la pièce</span>
+            </label>
+            <input
+              v-model="editionForm.name"
+              type="text"
+              class="input input-bordered input-sm md:input-md"
+              :disabled="saving"
+              placeholder="Nom affiché dans le catalogue"
+              required
+            >
+          </div>
+        </div>
+
+        <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+          <div class="form-control">
+            <label class="label">
+              <span class="label-text">Référence</span>
+            </label>
+            <input
+              v-model="editionForm.reference"
+              type="text"
+              class="input input-bordered input-sm md:input-md"
+              :disabled="saving"
+              placeholder="Référence interne ou constructeur"
+            >
+          </div>
+
+          <div class="form-control">
+            <label class="label">
+              <span class="label-text">Constructeur</span>
+            </label>
+            <ConstructeurSelect
+              v-model="editionForm.constructeurId"
+              class="w-full"
+              :disabled="saving"
+              placeholder="Rechercher un constructeur..."
+            />
+          </div>
+        </div>
+
+        <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+          <div class="form-control">
+            <label class="label">
+              <span class="label-text">Prix indicatif (€)</span>
+            </label>
+            <input
+              v-model="editionForm.prix"
+              type="number"
+              step="0.01"
+              min="0"
+              class="input input-bordered input-sm md:input-md"
+              :disabled="saving"
+              placeholder="Valeur indicatrice"
+            >
+          </div>
+        </div>
+
+        <div v-if="selectedType" class="space-y-3 rounded-lg border border-base-200 bg-base-200/40 p-4">
+          <div class="flex items-center justify-between gap-4">
+            <div>
+              <h2 class="font-semibold text-base-content">Squelette sélectionné</h2>
+              <p class="text-xs text-base-content/70">
+                {{ selectedType.description || 'Ce squelette définit la structure et les champs personnalisés de la pièce.' }}
+              </p>
+            </div>
+            <span class="badge badge-outline">{{ formatPieceStructurePreview(selectedType.structure) }}</span>
+          </div>
+
+          <details v-if="selectedType.structure" class="collapse collapse-arrow bg-base-100">
+            <summary class="collapse-title text-sm font-medium">
+              Consulter le détail du squelette
+            </summary>
+            <div class="collapse-content space-y-2 text-sm text-base-content/80">
+              <div v-if="getStructureCustomFields(selectedType.structure).length" class="space-y-1">
+                <h3 class="font-semibold text-sm text-base-content">Champs personnalisés</h3>
+                <ul class="list-disc list-inside space-y-1">
+                  <li v-for="field in getStructureCustomFields(selectedType.structure)" :key="field.name">
+                    <span class="font-medium">{{ field.name }}</span>
+                    <span v-if="field.value !== undefined && field.value !== null"> : {{ field.value }}</span>
+                  </li>
+                </ul>
+              </div>
+
+              <p v-else class="text-xs text-base-content/70">
+                Ce squelette ne définit pas encore de champs personnalisés.
+              </p>
+            </div>
+          </details>
+        </div>
+
+        <div v-if="customFieldInputs.length" class="space-y-4 rounded-lg border border-base-200 bg-base-200/40 p-4">
+          <header class="space-y-1">
+            <h2 class="font-semibold text-base-content">Champs personnalisés</h2>
+            <p class="text-xs text-base-content/70">
+              Mettez à jour les valeurs propres à cette pièce.
+            </p>
+          </header>
+          <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+            <div
+              v-for="(field, index) in customFieldInputs"
+              :key="fieldKey(field, index)"
+              class="form-control"
+            >
+              <label class="label">
+                <span class="label-text">{{ field.name }}</span>
+                <span v-if="field.required" class="label-text-alt text-error">*</span>
+              </label>
+              <input
+                v-if="field.type === 'text'"
+                v-model="field.value"
+                type="text"
+                class="input input-bordered input-sm md:input-md"
+                :required="field.required"
+                :disabled="saving"
+              >
+              <input
+                v-else-if="field.type === 'number'"
+                v-model="field.value"
+                type="number"
+                step="0.01"
+                class="input input-bordered input-sm md:input-md"
+                :required="field.required"
+                :disabled="saving"
+              >
+              <select
+                v-else-if="field.type === 'select'"
+                v-model="field.value"
+                class="select select-bordered select-sm md:select-md"
+                :required="field.required"
+                :disabled="saving"
+              >
+                <option value="">Sélectionner...</option>
+                <option
+                  v-for="option in field.options"
+                  :key="option"
+                  :value="option"
+                >
+                  {{ option }}
+                </option>
+              </select>
+              <div v-else-if="field.type === 'boolean'" class="flex items-center gap-2">
+                <input
+                  v-model="field.value"
+                  type="checkbox"
+                  class="checkbox checkbox-sm"
+                  true-value="true"
+                  false-value="false"
+                  :disabled="saving"
+                >
+                <span class="text-sm">{{ field.value === 'true' ? 'Oui' : 'Non' }}</span>
+              </div>
+              <input
+                v-else-if="field.type === 'date'"
+                v-model="field.value"
+                type="date"
+                class="input input-bordered input-sm md:input-md"
+                :required="field.required"
+                :disabled="saving"
+              >
+              <input
+                v-else
+                v-model="field.value"
+                type="text"
+                class="input input-bordered input-sm md:input-md"
+                :required="field.required"
+                :disabled="saving"
+              >
+            </div>
+          </div>
+        </div>
+
+        <div class="flex flex-col gap-3 md:flex-row md:justify-end">
+          <NuxtLink to="/pieces-catalog" class="btn btn-ghost" :class="{ 'btn-disabled': saving }">
+            Annuler
+          </NuxtLink>
+          <button type="button" class="btn btn-primary" :disabled="!canSubmit" @click="submitEdition">
+            <span v-if="saving" class="loading loading-spinner loading-sm mr-2" />
+            Enregistrer les modifications
+          </button>
+        </div>
+      </div>
+    </section>
+  </main>
+</template>
+
+<script setup lang="ts">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import { useRoute, useRouter } from '#imports'
+import ConstructeurSelect from '~/components/ConstructeurSelect.vue'
+import { usePieceTypes } from '~/composables/usePieceTypes'
+import { usePieces } from '~/composables/usePieces'
+import { useCustomFields } from '~/composables/useCustomFields'
+import { useApi } from '~/composables/useApi'
+import { useToast } from '~/composables/useToast'
+import { formatPieceStructurePreview } from '~/shared/modelUtils'
+import type { PieceModelStructure } from '~/shared/types/inventory'
+import type { ModelType } from '~/services/modelTypes'
+
+interface PieceCatalogType extends ModelType {
+  structure: PieceModelStructure | null
+  customFields?: Array<Record<string, any>>
+}
+
+interface CustomFieldInput {
+  id: string | null
+  name: string
+  type: string
+  required: boolean
+  options: string[]
+  value: string
+  customFieldId: string | null
+  customFieldValueId: string | null
+}
+
+const route = useRoute()
+const router = useRouter()
+const { get } = useApi()
+const { pieceTypes, loadPieceTypes } = usePieceTypes()
+const { updatePiece } = usePieces()
+const { upsertCustomFieldValue, updateCustomFieldValue } = useCustomFields()
+const toast = useToast()
+
+const piece = ref<any | null>(null)
+const loading = ref(true)
+const saving = ref(false)
+
+const selectedTypeId = ref<string>('')
+const editionForm = reactive({
+  name: '' as string,
+  reference: '' as string,
+  constructeurId: null as string | null,
+  prix: '' as string,
+})
+
+const customFieldInputs = ref<CustomFieldInput[]>([])
+
+const pieceTypeList = computed<PieceCatalogType[]>(() => (pieceTypes.value || []) as PieceCatalogType[])
+
+const selectedType = computed(() => {
+  if (!selectedTypeId.value) {
+    return null
+  }
+  return pieceTypeList.value.find((type) => type.id === selectedTypeId.value) ?? null
+})
+
+const requiredCustomFieldsFilled = computed(() =>
+  customFieldInputs.value.every((field) => {
+    if (!field.required) {
+      return true
+    }
+    if (field.type === 'boolean') {
+      return field.value === 'true' || field.value === 'false'
+    }
+    return field.value !== ''
+  }),
+)
+
+const canSubmit = computed(() => Boolean(
+  piece.value &&
+  editionForm.name &&
+  requiredCustomFieldsFilled.value &&
+  !saving.value,
+))
+
+const fetchPiece = async () => {
+  const id = route.params.id
+  if (!id || typeof id !== 'string') {
+    piece.value = null
+    return
+  }
+  const result = await get(`/pieces/${id}`)
+  piece.value = result.success ? result.data : null
+}
+
+let initialized = false
+
+watch(
+  [piece, selectedType],
+  ([currentPiece, currentType]) => {
+    if (!currentPiece || initialized) {
+      return
+    }
+
+    selectedTypeId.value = currentPiece.typePieceId || ''
+
+    editionForm.name = currentPiece.name || ''
+    editionForm.reference = currentPiece.reference || ''
+    editionForm.constructeurId = currentPiece.constructeur?.id || currentPiece.constructeurId || null
+    editionForm.prix = currentPiece.prix !== null && currentPiece.prix !== undefined ? String(currentPiece.prix) : ''
+
+    customFieldInputs.value = buildCustomFieldInputs(
+      currentType?.structure ?? null,
+      currentPiece.customFieldValues,
+    )
+
+    initialized = true
+  },
+  { immediate: true },
+)
+
+watch(selectedType, (currentType) => {
+  if (!piece.value || !currentType) {
+    return
+  }
+  customFieldInputs.value = buildCustomFieldInputs(
+    currentType.structure,
+    piece.value.customFieldValues,
+  )
+})
+
+const submitEdition = async () => {
+  if (!piece.value) {
+    return
+  }
+
+  const rawPrice = typeof editionForm.prix === 'string'
+    ? editionForm.prix.trim()
+    : editionForm.prix === null || editionForm.prix === undefined
+      ? ''
+      : String(editionForm.prix).trim()
+
+  const payload: Record<string, any> = {
+    name: editionForm.name.trim(),
+  }
+
+  const reference = editionForm.reference.trim()
+  payload.reference = reference ? reference : null
+  payload.constructeurId = editionForm.constructeurId || null
+
+  if (rawPrice) {
+    const parsed = Number(rawPrice)
+    if (!Number.isNaN(parsed)) {
+      payload.prix = parsed
+    }
+  } else {
+    payload.prix = null
+  }
+
+  saving.value = true
+  try {
+    const result = await updatePiece(piece.value.id, payload)
+    if (result.success) {
+      const updatedPiece = result.data
+      await saveCustomFieldValues(updatedPiece)
+      await router.push('/pieces-catalog')
+    }
+  } catch (error: any) {
+    toast.showError(error?.message || 'Erreur lors de la mise à jour de la pièce')
+  } finally {
+    saving.value = false
+  }
+}
+
+const buildCustomFieldInputs = (
+  structure: PieceModelStructure | null,
+  values: any[] | null,
+): CustomFieldInput[] => {
+  const definitions = normalizeCustomFieldInputs(structure)
+  const valueList = Array.isArray(values) ? values : []
+
+  const mapById = new Map<string, any>()
+  const mapByName = new Map<string, any>()
+
+  valueList.forEach((entry) => {
+    if (!entry || typeof entry !== 'object') {
+      return
+    }
+    const fieldId = entry.customField?.id || entry.customFieldId || null
+    if (fieldId) {
+      mapById.set(fieldId, entry)
+    }
+    const fieldName = entry.customField?.name || entry.name || entry.key || null
+    if (fieldName) {
+      mapByName.set(fieldName, entry)
+    }
+  })
+
+  const resolved: CustomFieldInput[] = definitions.map((definition) => {
+    const definitionId = definition.customFieldId || definition.id || null
+    const matched = (definitionId ? mapById.get(definitionId) : null) || mapByName.get(definition.name)
+
+    if (!matched) {
+      return {
+        ...definition,
+        customFieldId: definition.customFieldId || definition.id,
+        customFieldValueId: null,
+      }
+    }
+
+    const resolvedValue = matched.value ?? ''
+    return {
+      ...definition,
+      customFieldId: matched.customField?.id || definition.customFieldId || definition.id,
+      customFieldValueId: matched.id ?? null,
+      value: formatDefaultValue(definition.type, resolvedValue),
+    }
+  })
+
+  return resolved
+}
+
+const fieldKey = (field: CustomFieldInput, index: number) =>
+  field.customFieldValueId || field.id || `${field.name}-${index}`
+
+const normalizeCustomFieldInputs = (structure: PieceModelStructure | null): CustomFieldInput[] => {
+  if (!structure || typeof structure !== 'object') {
+    return []
+  }
+  const fields = Array.isArray(structure.customFields) ? structure.customFields : []
+  return fields
+    .map((field) => normalizeCustomField(field))
+    .filter((field): field is CustomFieldInput => field !== null)
+}
+
+const normalizeCustomField = (rawField: any): CustomFieldInput | null => {
+  if (!rawField || typeof rawField !== 'object') {
+    return null
+  }
+  const name = resolveFieldName(rawField)
+  if (!name) {
+    return null
+  }
+  const type = resolveFieldType(rawField)
+  const required = !!rawField.required
+  const options = Array.isArray(rawField.options)
+    ? rawField.options.filter((option: unknown): option is string => typeof option === 'string')
+    : []
+  const value = formatDefaultValue(type, rawField.value)
+  const id = typeof rawField.id === 'string' ? rawField.id : null
+  const customFieldId = typeof rawField.customFieldId === 'string' ? rawField.customFieldId : id
+  const customFieldValueId = typeof rawField.customFieldValueId === 'string'
+    ? rawField.customFieldValueId
+    : null
+
+  return { id, name, type, required, options, value, customFieldId, customFieldValueId }
+}
+
+const resolveFieldName = (field: any): string => {
+  if (typeof field?.name === 'string' && field.name.trim()) {
+    return field.name.trim()
+  }
+  if (typeof field?.key === 'string' && field.key.trim()) {
+    return field.key.trim()
+  }
+  if (typeof field?.label === 'string' && field.label.trim()) {
+    return field.label.trim()
+  }
+  return ''
+}
+
+const resolveFieldType = (field: any): string => {
+  const allowed = ['text', 'number', 'select', 'boolean', 'date']
+  const value = typeof field?.type === 'string' ? field.type.toLowerCase() : ''
+  return allowed.includes(value) ? value : 'text'
+}
+
+const formatDefaultValue = (type: string, defaultValue: any): string => {
+  if (defaultValue === null || defaultValue === undefined) {
+    return ''
+  }
+  if (type === 'boolean') {
+    const normalized = String(defaultValue).toLowerCase()
+    if (normalized === 'true' || normalized === '1') {
+      return 'true'
+    }
+    if (normalized === 'false' || normalized === '0') {
+      return 'false'
+    }
+    return ''
+  }
+  return String(defaultValue)
+}
+
+const getStructureCustomFields = (structure: PieceModelStructure | null) => Array.isArray(structure?.customFields) ? structure.customFields : []
+
+const buildCustomFieldMetadata = (field: CustomFieldInput) => ({
+  customFieldName: field.name,
+  customFieldType: field.type,
+  customFieldRequired: field.required,
+  customFieldOptions: field.options,
+})
+
+const shouldPersistField = (field: CustomFieldInput) => {
+  if (field.type === 'boolean') {
+    return field.value === 'true' || field.value === 'false'
+  }
+  return field.value.trim() !== ''
+}
+
+const formatValueForPersistence = (field: CustomFieldInput) => {
+  if (field.type === 'boolean') {
+    return field.value === 'true' ? 'true' : 'false'
+  }
+  return field.value.trim()
+}
+
+const saveCustomFieldValues = async (updatedPiece: any) => {
+  if (!updatedPiece || !updatedPiece.id) {
+    return
+  }
+
+  const definitionMap = new Map<string, string>()
+  const registerDefinitions = (fields: any[]) => {
+    if (!Array.isArray(fields)) {
+      return
+    }
+    fields.forEach((field) => {
+      if (!field || typeof field !== 'object') {
+        return
+      }
+      const name = typeof field.name === 'string' ? field.name : null
+      const id = typeof field.id === 'string' ? field.id : null
+      if (name && id && !definitionMap.has(name)) {
+        definitionMap.set(name, id)
+      }
+    })
+  }
+
+  registerDefinitions(updatedPiece?.typePiece?.pieceCustomFields)
+  registerDefinitions(updatedPiece?.typeMachinePieceRequirement?.typePiece?.pieceCustomFields)
+
+  const resolveDefinitionId = (field: CustomFieldInput) => {
+    if (field.customFieldId) {
+      return field.customFieldId
+    }
+    if (field.id) {
+      return field.id
+    }
+    return definitionMap.get(field.name) ?? null
+  }
+
+  for (const field of customFieldInputs.value) {
+    if (!shouldPersistField(field)) {
+      continue
+    }
+
+    const definitionId = resolveDefinitionId(field)
+    const metadata = definitionId ? undefined : buildCustomFieldMetadata(field)
+    const value = formatValueForPersistence(field)
+
+    if (field.customFieldValueId) {
+      const result = await updateCustomFieldValue(field.customFieldValueId, { value })
+      if (!result.success) {
+        toast.showError(`Impossible de mettre à jour le champ personnalisé "${field.name}"`)
+      } else if (definitionId && !field.customFieldId) {
+        field.customFieldId = definitionId
+      }
+      continue
+    }
+
+    const result = await upsertCustomFieldValue(
+      definitionId,
+      'piece',
+      updatedPiece.id,
+      value,
+      metadata,
+    )
+
+    if (!result.success) {
+      toast.showError(`Impossible d'enregistrer le champ personnalisé "${field.name}"`)
+    } else {
+      const createdValue = result.data
+      if (createdValue?.id) {
+        field.customFieldValueId = createdValue.id
+      }
+      const resolvedId = createdValue?.customField?.id || definitionId
+      if (resolvedId) {
+        field.customFieldId = resolvedId
+      }
+    }
+  }
+}
+
+onMounted(async () => {
+  await Promise.allSettled([loadPieceTypes(), fetchPiece()])
+  loading.value = false
+})
+</script>
diff --git a/app/pages/pieces/create.vue b/app/pages/pieces/create.vue
new file mode 100644
index 0000000..47089c0
--- /dev/null
+++ b/app/pages/pieces/create.vue
@@ -0,0 +1,577 @@
+<template>
+  <main class="mx-auto flex w-full max-w-5xl flex-col gap-8 px-4 py-8 sm:px-6 lg:px-8">
+    <header class="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">
+      <div class="space-y-1">
+        <h1 class="text-3xl font-semibold text-base-content">Nouvelle pièce</h1>
+        <p class="text-sm text-base-content/70">
+          Choisissez la catégorie adaptée puis renseignez toutes les informations de votre pièce.
+        </p>
+      </div>
+      <NuxtLink to="/pieces-catalog" class="btn btn-ghost btn-sm md:btn-md self-start">
+        Retour au catalogue
+      </NuxtLink>
+    </header>
+
+    <section class="card border border-base-200 bg-base-100 shadow-sm">
+      <div class="card-body space-y-6">
+        <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+          <div class="form-control">
+            <label class="label">
+              <span class="label-text">Catégorie de pièce</span>
+            </label>
+            <select
+              v-model="selectedTypeId"
+              class="select select-bordered select-sm md:select-md"
+              :disabled="loadingTypes || submitting"
+              required
+            >
+              <option value="">Sélectionner une catégorie</option>
+              <option
+                v-for="type in pieceTypeList"
+                :key="type.id"
+                :value="type.id"
+              >
+                {{ type.name }}
+              </option>
+            </select>
+            <p v-if="loadingTypes" class="text-xs text-gray-500 mt-1">
+              Chargement des catégories…
+            </p>
+          </div>
+        </div>
+
+        <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+          <div class="form-control">
+            <label class="label">
+              <span class="label-text">Nom de la pièce</span>
+            </label>
+            <input
+              v-model="creationForm.name"
+              type="text"
+              class="input input-bordered input-sm md:input-md"
+              :disabled="submitting || !selectedType"
+              placeholder="Nom affiché dans le catalogue"
+              required
+            >
+          </div>
+        </div>
+
+        <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+          <div class="form-control">
+            <label class="label">
+              <span class="label-text">Référence</span>
+            </label>
+            <input
+              v-model="creationForm.reference"
+              type="text"
+              class="input input-bordered input-sm md:input-md"
+              :disabled="submitting || !selectedType"
+              placeholder="Référence interne ou constructeur"
+            >
+          </div>
+
+          <div class="form-control">
+            <label class="label">
+              <span class="label-text">Constructeur</span>
+            </label>
+            <ConstructeurSelect
+              v-model="creationForm.constructeurId"
+              class="w-full"
+              :disabled="submitting || !selectedType"
+              placeholder="Rechercher un constructeur..."
+            />
+          </div>
+        </div>
+
+        <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+          <div class="form-control">
+            <label class="label">
+              <span class="label-text">Prix indicatif (€)</span>
+            </label>
+            <input
+              v-model="creationForm.prix"
+              type="number"
+              step="0.01"
+              min="0"
+              class="input input-bordered input-sm md:input-md"
+              :disabled="submitting || !selectedType"
+              placeholder="Valeur indicatrice"
+            >
+          </div>
+        </div>
+
+        <div v-if="selectedType" class="space-y-3 rounded-lg border border-base-200 bg-base-200/40 p-4">
+          <div class="flex items-center justify-between gap-4">
+            <div>
+              <h2 class="font-semibold text-base-content">Squelette sélectionné</h2>
+              <p class="text-xs text-base-content/70">
+                {{ selectedType.description || 'Ce squelette définit la structure et les champs personnalisés de la pièce.' }}
+              </p>
+            </div>
+            <span class="badge badge-outline">{{ formatPieceStructurePreview(selectedType.structure) }}</span>
+          </div>
+
+          <details v-if="selectedType.structure" class="collapse collapse-arrow bg-base-100">
+            <summary class="collapse-title text-sm font-medium">
+              Consulter le détail du squelette
+            </summary>
+            <div class="collapse-content space-y-2 text-sm text-base-content/80">
+              <div v-if="getStructureCustomFields(selectedType.structure).length" class="space-y-1">
+                <h3 class="font-semibold text-sm text-base-content">Champs personnalisés</h3>
+                <ul class="list-disc list-inside space-y-1">
+                  <li v-for="field in getStructureCustomFields(selectedType.structure)" :key="field.name">
+                    <span class="font-medium">{{ field.name }}</span>
+                    <span v-if="field.value !== undefined && field.value !== null"> : {{ field.value }}</span>
+                  </li>
+                </ul>
+              </div>
+
+              <p v-else class="text-xs text-base-content/70">
+                Ce squelette ne définit pas encore de champs personnalisés.
+              </p>
+            </div>
+          </details>
+        </div>
+
+        <div v-if="customFieldInputs.length" class="space-y-4 rounded-lg border border-base-200 bg-base-200/40 p-4">
+          <header class="space-y-1">
+            <h2 class="font-semibold text-base-content">Champs personnalisés</h2>
+            <p class="text-xs text-base-content/70">
+              Renseignez les valeurs propres à cette pièce. Ces champs complètent le squelette sélectionné.
+            </p>
+          </header>
+          <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+            <div
+              v-for="(field, index) in customFieldInputs"
+              :key="fieldKey(field, index)"
+              class="form-control"
+            >
+              <label class="label">
+                <span class="label-text">{{ field.name }}</span>
+                <span v-if="field.required" class="label-text-alt text-error">*</span>
+              </label>
+              <input
+                v-if="field.type === 'text'"
+                v-model="field.value"
+                type="text"
+                class="input input-bordered input-sm md:input-md"
+                :required="field.required"
+                :disabled="submitting"
+              >
+              <input
+                v-else-if="field.type === 'number'"
+                v-model="field.value"
+                type="number"
+                step="0.01"
+                class="input input-bordered input-sm md:input-md"
+                :required="field.required"
+                :disabled="submitting"
+              >
+              <select
+                v-else-if="field.type === 'select'"
+                v-model="field.value"
+                class="select select-bordered select-sm md:select-md"
+                :required="field.required"
+                :disabled="submitting"
+              >
+                <option value="">Sélectionner...</option>
+                <option
+                  v-for="option in field.options"
+                  :key="option"
+                  :value="option"
+                >
+                  {{ option }}
+                </option>
+              </select>
+              <div v-else-if="field.type === 'boolean'" class="flex items-center gap-2">
+                <input
+                  v-model="field.value"
+                  type="checkbox"
+                  class="checkbox checkbox-sm"
+                  true-value="true"
+                  false-value="false"
+                  :disabled="submitting"
+                >
+                <span class="text-sm">{{ field.value === 'true' ? 'Oui' : 'Non' }}</span>
+              </div>
+              <input
+                v-else-if="field.type === 'date'"
+                v-model="field.value"
+                type="date"
+                class="input input-bordered input-sm md:input-md"
+                :required="field.required"
+                :disabled="submitting"
+              >
+              <input
+                v-else
+                v-model="field.value"
+                type="text"
+                class="input input-bordered input-sm md:input-md"
+                :required="field.required"
+                :disabled="submitting"
+              >
+            </div>
+          </div>
+        </div>
+
+        <div class="flex flex-col gap-3 md:flex-row md:justify-end">
+          <NuxtLink to="/pieces-catalog" class="btn btn-ghost" :class="{ 'btn-disabled': submitting }">
+            Annuler
+          </NuxtLink>
+          <button type="button" class="btn btn-primary" :disabled="!canSubmit" @click="submitCreation">
+            <span v-if="submitting" class="loading loading-spinner loading-sm mr-2"></span>
+            Créer la pièce
+          </button>
+        </div>
+      </div>
+    </section>
+  </main>
+</template>
+
+<script setup lang="ts">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import { useRoute, useRouter } from '#imports'
+import ConstructeurSelect from '~/components/ConstructeurSelect.vue'
+import { usePieceTypes } from '~/composables/usePieceTypes'
+import { usePieces } from '~/composables/usePieces'
+import { useToast } from '~/composables/useToast'
+import { useCustomFields } from '~/composables/useCustomFields'
+import { formatPieceStructurePreview } from '~/shared/modelUtils'
+import type { PieceModelStructure } from '~/shared/types/inventory'
+import type { ModelType } from '~/services/modelTypes'
+
+interface PieceCatalogType extends ModelType {
+  structure: PieceModelStructure | null
+  customFields?: Array<Record<string, any>>
+}
+
+const route = useRoute()
+const router = useRouter()
+
+const { pieceTypes, loadPieceTypes, loadingPieceTypes } = usePieceTypes()
+const { createPiece } = usePieces()
+const toast = useToast()
+const { upsertCustomFieldValue, updateCustomFieldValue } = useCustomFields()
+
+const initialTypeId = ref<string>(typeof route.query.typeId === 'string' ? route.query.typeId : '')
+const selectedTypeId = ref<string>(initialTypeId.value)
+const submitting = ref(false)
+const creationForm = reactive({
+  name: '' as string,
+  reference: '' as string,
+  constructeurId: null as string | null,
+  prix: '' as string,
+})
+
+const lastSuggestedName = ref('')
+const customFieldInputs = ref<CustomFieldInput[]>([])
+
+watch(
+  () => route.query.typeId,
+  (value) => {
+    if (typeof value === 'string') {
+      selectedTypeId.value = value
+    }
+  },
+)
+
+watch(selectedTypeId, (id) => {
+  const current = typeof route.query.typeId === 'string' ? route.query.typeId : ''
+  if ((id || '') === current) {
+    return
+  }
+  const nextQuery = { ...route.query }
+  if (id) {
+    nextQuery.typeId = id
+  } else {
+    delete nextQuery.typeId
+  }
+  router.replace({ path: route.path, query: nextQuery }).catch(() => {})
+})
+
+const loadingTypes = computed(() => loadingPieceTypes.value)
+const pieceTypeList = computed<PieceCatalogType[]>(() => (pieceTypes.value || []) as PieceCatalogType[])
+
+const selectedType = computed(() => {
+  if (!selectedTypeId.value) {
+    return null
+  }
+  return pieceTypeList.value.find((type) => type.id === selectedTypeId.value) ?? null
+})
+
+watch(selectedType, (type) => {
+  if (!type) {
+    clearCreationForm()
+    customFieldInputs.value = []
+    return
+  }
+  if (!creationForm.name || creationForm.name === lastSuggestedName.value) {
+    creationForm.name = type.name
+  }
+  lastSuggestedName.value = creationForm.name
+  customFieldInputs.value = normalizeCustomFieldInputs(type.structure)
+})
+
+const requiredCustomFieldsFilled = computed(() =>
+  customFieldInputs.value.every((field) => {
+    if (!field.required) {
+      return true
+    }
+    if (field.type === 'boolean') {
+      return field.value === 'true' || field.value === 'false'
+    }
+    return field.value !== ''
+  }),
+)
+
+const canSubmit = computed(() => Boolean(
+  selectedType.value &&
+  creationForm.name &&
+  requiredCustomFieldsFilled.value &&
+  !submitting.value,
+))
+
+const getStructureCustomFields = (structure: PieceModelStructure | null) => Array.isArray(structure?.customFields) ? structure.customFields : []
+
+const clearCreationForm = () => {
+  creationForm.name = ''
+  creationForm.reference = ''
+  creationForm.constructeurId = null
+  creationForm.prix = ''
+  lastSuggestedName.value = ''
+}
+
+const submitCreation = async () => {
+  if (!selectedType.value) {
+    toast.showError('Sélectionnez une catégorie de pièce.')
+    return
+  }
+  const payload: Record<string, any> = {
+    name: creationForm.name.trim(),
+    typePieceId: selectedType.value.id,
+  }
+
+  const reference = creationForm.reference.trim()
+  if (reference) {
+    payload.reference = reference
+  }
+
+  if (creationForm.constructeurId) {
+    payload.constructeurId = creationForm.constructeurId
+  }
+
+  const rawPrice = typeof creationForm.prix === 'string'
+    ? creationForm.prix.trim()
+    : creationForm.prix === null || creationForm.prix === undefined
+      ? ''
+      : String(creationForm.prix).trim()
+
+  if (rawPrice) {
+    const parsed = Number(rawPrice)
+    if (!Number.isNaN(parsed)) {
+      payload.prix = parsed
+    }
+  }
+
+  submitting.value = true
+  try {
+    const result = await createPiece(payload)
+    if (result.success) {
+      await saveCustomFieldValues(result.data)
+      toast.showSuccess('Pièce créée avec succès')
+      await router.push('/pieces-catalog')
+    } else if (result.error) {
+      toast.showError(result.error)
+    }
+  } catch (error: any) {
+    toast.showError(error?.message || 'Erreur lors de la création de la pièce')
+  } finally {
+    submitting.value = false
+  }
+}
+
+onMounted(async () => {
+  await loadPieceTypes()
+})
+
+interface CustomFieldInput {
+  id: string | null
+  name: string
+  type: string
+  required: boolean
+  options: string[]
+  value: string
+  customFieldId: string | null
+  customFieldValueId: string | null
+}
+
+const fieldKey = (field: CustomFieldInput, index: number) =>
+  field.customFieldValueId || field.id || `${field.name}-${index}`
+
+const normalizeCustomFieldInputs = (structure: PieceModelStructure | null): CustomFieldInput[] => {
+  if (!structure || typeof structure !== 'object') {
+    return []
+  }
+  const fields = Array.isArray(structure.customFields) ? structure.customFields : []
+  return fields
+    .map((field) => normalizeCustomField(field))
+    .filter((field): field is CustomFieldInput => field !== null)
+}
+
+const normalizeCustomField = (rawField: any): CustomFieldInput | null => {
+  if (!rawField || typeof rawField !== 'object') {
+    return null
+  }
+  const name = resolveFieldName(rawField)
+  if (!name) {
+    return null
+  }
+  const type = resolveFieldType(rawField)
+  const required = !!rawField.required
+  const options = Array.isArray(rawField.options)
+    ? rawField.options.filter((option: unknown): option is string => typeof option === 'string')
+    : []
+  const value = formatDefaultValue(type, rawField.value)
+  const id = typeof rawField.id === 'string' ? rawField.id : null
+  const customFieldId = typeof rawField.customFieldId === 'string' ? rawField.customFieldId : id
+  const customFieldValueId = typeof rawField.customFieldValueId === 'string'
+    ? rawField.customFieldValueId
+    : null
+
+  return { id, name, type, required, options, value, customFieldId, customFieldValueId }
+}
+
+const resolveFieldName = (field: any): string => {
+  if (typeof field?.name === 'string' && field.name.trim()) {
+    return field.name.trim()
+  }
+  if (typeof field?.key === 'string' && field.key.trim()) {
+    return field.key.trim()
+  }
+  if (typeof field?.label === 'string' && field.label.trim()) {
+    return field.label.trim()
+  }
+  return ''
+}
+
+const resolveFieldType = (field: any): string => {
+  const allowed = ['text', 'number', 'select', 'boolean', 'date']
+  const value = typeof field?.type === 'string' ? field.type.toLowerCase() : ''
+  return allowed.includes(value) ? value : 'text'
+}
+
+const formatDefaultValue = (type: string, defaultValue: any): string => {
+  if (defaultValue === null || defaultValue === undefined) {
+    return ''
+  }
+  if (type === 'boolean') {
+    const normalized = String(defaultValue).toLowerCase()
+    if (normalized === 'true' || normalized === '1') {
+      return 'true'
+    }
+    if (normalized === 'false' || normalized === '0') {
+      return 'false'
+    }
+    return ''
+  }
+  return String(defaultValue)
+}
+
+const buildCustomFieldMetadata = (field: CustomFieldInput) => ({
+  customFieldName: field.name,
+  customFieldType: field.type,
+  customFieldRequired: field.required,
+  customFieldOptions: field.options,
+})
+
+const saveCustomFieldValues = async (createdPiece: any) => {
+  if (!createdPiece || !createdPiece.id) {
+    return
+  }
+
+  const definitionMap = new Map<string, string>()
+  const registerDefinitions = (fields: any[]) => {
+    if (!Array.isArray(fields)) {
+      return
+    }
+    fields.forEach((field) => {
+      if (!field || typeof field !== 'object') {
+        return
+      }
+      const name = typeof field.name === 'string' ? field.name : null
+      const id = typeof field.id === 'string' ? field.id : null
+      if (name && id && !definitionMap.has(name)) {
+        definitionMap.set(name, id)
+      }
+    })
+  }
+
+  registerDefinitions(createdPiece?.typePiece?.pieceCustomFields)
+  registerDefinitions(createdPiece?.typeMachinePieceRequirement?.typePiece?.pieceCustomFields)
+
+  const customizeFieldId = (field: CustomFieldInput) => {
+    if (field.customFieldId) {
+      return field.customFieldId
+    }
+    if (field.id) {
+      return field.id
+    }
+    return definitionMap.get(field.name) ?? null
+  }
+
+  for (const field of customFieldInputs.value) {
+    if (!shouldPersistField(field)) {
+      continue
+    }
+
+    const definitionId = customizeFieldId(field)
+    const metadata = definitionId ? undefined : buildCustomFieldMetadata(field)
+    const value = formatValueForPersistence(field)
+
+    if (field.customFieldValueId) {
+      const result = await updateCustomFieldValue(field.customFieldValueId, { value })
+      if (!result.success) {
+        toast.showError(`Impossible de mettre à jour le champ personnalisé "${field.name}"`)
+      } else if (definitionId && !field.customFieldId) {
+        field.customFieldId = definitionId
+      }
+      continue
+    }
+
+    const result = await upsertCustomFieldValue(
+      definitionId,
+      'piece',
+      createdPiece.id,
+      value,
+      metadata,
+    )
+
+    if (!result.success) {
+      toast.showError(`Impossible d'enregistrer le champ personnalisé "${field.name}"`)
+    } else {
+      const createdValue = result.data
+      if (createdValue?.id) {
+        field.customFieldValueId = createdValue.id
+      }
+      const resolvedId = createdValue?.customField?.id || definitionId
+      if (resolvedId) {
+        field.customFieldId = resolvedId
+      }
+    }
+  }
+}
+
+const shouldPersistField = (field: CustomFieldInput) => {
+  if (field.type === 'boolean') {
+    return field.value === 'true' || field.value === 'false'
+  }
+  return field.value.trim() !== ''
+}
+
+const formatValueForPersistence = (field: CustomFieldInput) => {
+  if (field.type === 'boolean') {
+    return field.value === 'true' ? 'true' : 'false'
+  }
+  return field.value.trim()
+}
+</script>