strapi-plugin-hubspot 0.16.0 → 0.16.2

package/dist/_chunks/{fr-CfohMY8n.mjs → fr-C7t1elmR.mjs}

@@ -164,7 +164,11 @@ const fr = {
   "editor.hubspot-form": "Formulaire marketing HubSpot",
   "editor.hubspot-form-placeholder": "Choisir un formulaire du portail connecté",
   "editor.hubspot-form-none": "Aucun — upsert CRM uniquement",
-  "editor.hubspot-form-hint": "Les envois passent par l’API Forms de HubSpot pour compter comme des conversions. Changez de portail (test → prod) et sélectionnez le formulaire correspondant — rien n’est figé dans le code.",
+  "editor.hubspot-form-hint": "Les envois passent par l’API Forms de HubSpot pour compter comme des conversions. Après une modification dans HubSpot, utilisez Resynchroniser — les champs mappés se mettent à jour sur place, les nouveaux s’ajoutent, vos étapes restent.",
+  "editor.resync": "Resynchroniser depuis HubSpot",
+  "editor.resynced": "Resynchronisé depuis HubSpot — {updated, plural, one {# champ mis à jour} other {# champs mis à jour}}, {added, plural, one {# ajouté} other {# ajoutés}}.",
+  "editor.resynced-gaps": "Resynchronisé depuis HubSpot — {updated, plural, one {# mis à jour} other {# mis à jour}}, {added, plural, one {# ajouté} other {# ajoutés}}, {skipped, plural, one {# écarté} other {# écartés}}.",
+  "editor.resync-error": "Resynchronisation impossible — le formulaire est-il toujours lié ?",
   "editor.form-hint": "Sélectionnez une étape ou un champ pour l'éditer. Le endpoint public sert ce formulaire sur /api/hubspot/forms/{slug}.",
   "panel.label": "Libellé",
   "panel.name": "Clé du payload",
@@ -234,7 +238,7 @@ const fr = {
   "forms.col-submissions": "Soumissions",
   "forms.submissions": "Soumissions",
   "forms.import-hubspot-title": "Importer depuis votre portail HubSpot",
-  "forms.import-hubspot-hint": "Traduit un formulaire construit dans HubSpot en brouillon ici, mapping CRM inclus. Ce que le builder ne sait pas exprimer est écarté et signalé. Ré-importer écrase le brouillon.",
+  "forms.import-hubspot-hint": "Traduit un formulaire construit dans HubSpot en brouillon ici, mapping CRM inclus. Ce que le builder ne sait pas exprimer est écarté et signalé. Ré-importer met à jour les champs mappés et ajoute les nouveaux.",
   "forms.import-hubspot-source": "Formulaire HubSpot à importer",
   "forms.hubspot-list-error": "Impossible de lister les formulaires du portail — le jeton a besoin du scope de lecture `forms`.",
   "forms.report-title": "Importé avec des manques",
@@ -295,7 +299,7 @@ const fr = {
   "company.datum.nafLabel": "Libellé NAF",
   "company.datum.headcount": "Tranche d'effectif",
   "editor.drag-step": "Glisser pour réordonner l'étape",
-  "editor.drag-field": "Glisser pour réordonner le champ"
+  "editor.drag-field": "Glisser pour déplacer le champ, y compris vers une autre étape"
 };
 export {
   fr as default

package/dist/_chunks/{fr-pOP8ZXqM.js → fr-sF5Josfh.js}

@@ -166,7 +166,11 @@ const fr = {
   "editor.hubspot-form": "Formulaire marketing HubSpot",
   "editor.hubspot-form-placeholder": "Choisir un formulaire du portail connecté",
   "editor.hubspot-form-none": "Aucun — upsert CRM uniquement",
-  "editor.hubspot-form-hint": "Les envois passent par l’API Forms de HubSpot pour compter comme des conversions. Changez de portail (test → prod) et sélectionnez le formulaire correspondant — rien n’est figé dans le code.",
+  "editor.hubspot-form-hint": "Les envois passent par l’API Forms de HubSpot pour compter comme des conversions. Après une modification dans HubSpot, utilisez Resynchroniser — les champs mappés se mettent à jour sur place, les nouveaux s’ajoutent, vos étapes restent.",
+  "editor.resync": "Resynchroniser depuis HubSpot",
+  "editor.resynced": "Resynchronisé depuis HubSpot — {updated, plural, one {# champ mis à jour} other {# champs mis à jour}}, {added, plural, one {# ajouté} other {# ajoutés}}.",
+  "editor.resynced-gaps": "Resynchronisé depuis HubSpot — {updated, plural, one {# mis à jour} other {# mis à jour}}, {added, plural, one {# ajouté} other {# ajoutés}}, {skipped, plural, one {# écarté} other {# écartés}}.",
+  "editor.resync-error": "Resynchronisation impossible — le formulaire est-il toujours lié ?",
   "editor.form-hint": "Sélectionnez une étape ou un champ pour l'éditer. Le endpoint public sert ce formulaire sur /api/hubspot/forms/{slug}.",
   "panel.label": "Libellé",
   "panel.name": "Clé du payload",
@@ -236,7 +240,7 @@ const fr = {
   "forms.col-submissions": "Soumissions",
   "forms.submissions": "Soumissions",
   "forms.import-hubspot-title": "Importer depuis votre portail HubSpot",
-  "forms.import-hubspot-hint": "Traduit un formulaire construit dans HubSpot en brouillon ici, mapping CRM inclus. Ce que le builder ne sait pas exprimer est écarté et signalé. Ré-importer écrase le brouillon.",
+  "forms.import-hubspot-hint": "Traduit un formulaire construit dans HubSpot en brouillon ici, mapping CRM inclus. Ce que le builder ne sait pas exprimer est écarté et signalé. Ré-importer met à jour les champs mappés et ajoute les nouveaux.",
   "forms.import-hubspot-source": "Formulaire HubSpot à importer",
   "forms.hubspot-list-error": "Impossible de lister les formulaires du portail — le jeton a besoin du scope de lecture `forms`.",
   "forms.report-title": "Importé avec des manques",
@@ -297,6 +301,6 @@ const fr = {
   "company.datum.nafLabel": "Libellé NAF",
   "company.datum.headcount": "Tranche d'effectif",
   "editor.drag-step": "Glisser pour réordonner l'étape",
-  "editor.drag-field": "Glisser pour réordonner le champ"
+  "editor.drag-field": "Glisser pour déplacer le champ, y compris vers une autre étape"
 };
 exports.default = fr;

package/dist/_chunks/{index-7cL9PRh1.mjs → index-CLAy5dVN.mjs}

@@ -25,7 +25,7 @@ const index = {
       icon: PaperPlane,
       intlLabel: { id: `${PLUGIN_ID}.menu.label`, defaultMessage: "HubSpot Forms" },
       permissions: [{ action: `plugin::${PLUGIN_ID}.forms`, subject: null }],
-      Component: async () => (await import("./Forms-6EoEYzAc.mjs")).default
+      Component: async () => (await import("./Forms-BOQWely0.mjs")).default
     });
     app.customFields.register({
       name: "property",
@@ -40,7 +40,7 @@ const index = {
         defaultMessage: "Picked from the portal's real properties"
       },
       components: {
-        Input: async () => import("./HubspotPropertyInput-CrYP4pc0.mjs")
+        Input: async () => import("./HubspotPropertyInput-BHfpBD36.mjs")
       },
       // Exposed in the Content-Type Builder. Without this, `objectField` could
       // only be set by hand-editing schema.json — which is not how anyone
@@ -103,7 +103,7 @@ const index = {
         defaultMessage: "Picked from the portal's configured objects"
       },
       components: {
-        Input: async () => import("./HubspotObjectInput-DhsnSguG.mjs")
+        Input: async () => import("./HubspotObjectInput-BbnvhdbD.mjs")
       }
     });
     app.customFields.register({
@@ -119,7 +119,7 @@ const index = {
         defaultMessage: "A form built in the HubSpot form builder, stored by slug"
       },
       components: {
-        Input: async () => import("./HubspotFormInput-V5w4y1fb.mjs")
+        Input: async () => import("./HubspotFormInput-DCkoavrN.mjs")
       }
     });
     app.createSettingSection(
@@ -135,7 +135,7 @@ const index = {
           // Mirrors the RBAC action registered server-side: a role without it
           // doesn't see the link at all — the routes refuse it anyway.
           permissions: [{ action: `plugin::${PLUGIN_ID}.settings`, subject: null }],
-          Component: async () => (await import("./Settings-CjcWj9I6.mjs")).default
+          Component: async () => (await import("./Settings-DqRpHtnT.mjs")).default
         }
       ]
     );
@@ -145,7 +145,7 @@ const index = {
     return Promise.all(
       locales.map(async (locale) => {
         try {
-          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => import("./en-D6GHgMOt.mjs"), "./translations/fr.json": () => import("./fr-CfohMY8n.mjs") }), `./translations/${locale}.json`, 3);
+          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => import("./en-Djd3TID0.mjs"), "./translations/fr.json": () => import("./fr-C7t1elmR.mjs") }), `./translations/${locale}.json`, 3);
           return { data: prefixPluginTranslations(data), locale };
         } catch {
           return { data: {}, locale };

package/dist/_chunks/{index-CodpLKZx.js → index-R3ReZXF1.js}

@@ -26,7 +26,7 @@ const index = {
       icon: icons.PaperPlane,
       intlLabel: { id: `${PLUGIN_ID}.menu.label`, defaultMessage: "HubSpot Forms" },
       permissions: [{ action: `plugin::${PLUGIN_ID}.forms`, subject: null }],
-      Component: async () => (await Promise.resolve().then(() => require("./Forms-BW_zGc1P.js"))).default
+      Component: async () => (await Promise.resolve().then(() => require("./Forms-mMNP7hc9.js"))).default
     });
     app.customFields.register({
       name: "property",
@@ -41,7 +41,7 @@ const index = {
         defaultMessage: "Picked from the portal's real properties"
       },
       components: {
-        Input: async () => Promise.resolve().then(() => require("./HubspotPropertyInput-luFfnxqy.js"))
+        Input: async () => Promise.resolve().then(() => require("./HubspotPropertyInput-BLZzsW08.js"))
       },
       // Exposed in the Content-Type Builder. Without this, `objectField` could
       // only be set by hand-editing schema.json — which is not how anyone
@@ -104,7 +104,7 @@ const index = {
         defaultMessage: "Picked from the portal's configured objects"
       },
       components: {
-        Input: async () => Promise.resolve().then(() => require("./HubspotObjectInput-Bmo6YQgs.js"))
+        Input: async () => Promise.resolve().then(() => require("./HubspotObjectInput-Cq1TuL_l.js"))
       }
     });
     app.customFields.register({
@@ -120,7 +120,7 @@ const index = {
         defaultMessage: "A form built in the HubSpot form builder, stored by slug"
       },
       components: {
-        Input: async () => Promise.resolve().then(() => require("./HubspotFormInput-oMhm1UJm.js"))
+        Input: async () => Promise.resolve().then(() => require("./HubspotFormInput-DI35Aqiu.js"))
       }
     });
     app.createSettingSection(
@@ -136,7 +136,7 @@ const index = {
           // Mirrors the RBAC action registered server-side: a role without it
           // doesn't see the link at all — the routes refuse it anyway.
           permissions: [{ action: `plugin::${PLUGIN_ID}.settings`, subject: null }],
-          Component: async () => (await Promise.resolve().then(() => require("./Settings-B3A22i7Z.js"))).default
+          Component: async () => (await Promise.resolve().then(() => require("./Settings-BAsx0LGv.js"))).default
         }
       ]
     );
@@ -146,7 +146,7 @@ const index = {
     return Promise.all(
       locales.map(async (locale) => {
         try {
-          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => Promise.resolve().then(() => require("./en-C7ls2EUl.js")), "./translations/fr.json": () => Promise.resolve().then(() => require("./fr-pOP8ZXqM.js")) }), `./translations/${locale}.json`, 3);
+          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => Promise.resolve().then(() => require("./en-sfzopB5K.js")), "./translations/fr.json": () => Promise.resolve().then(() => require("./fr-sF5Josfh.js")) }), `./translations/${locale}.json`, 3);
           return { data: prefixPluginTranslations(data), locale };
         } catch {
           return { data: {}, locale };

package/dist/_chunks/{objectLabels-Dnj14fsp.mjs → objectLabels--zOmqsfm.mjs}

@@ -1,4 +1,4 @@
-import { g as getTranslation } from "./index-7cL9PRh1.mjs";
+import { g as getTranslation } from "./index-CLAy5dVN.mjs";
 const STANDARD = /* @__PURE__ */ new Set([
   "contact",
   "company",

package/dist/_chunks/{objectLabels-CSWGIgNb.js → objectLabels-CW2iBOkD.js}

@@ -1,5 +1,5 @@
 "use strict";
-const index = require("./index-CodpLKZx.js");
+const index = require("./index-R3ReZXF1.js");
 const STANDARD = /* @__PURE__ */ new Set([
   "contact",
   "company",

package/dist/_chunks/{useHubspotSchema-DiRN3HrN.js → useHubspotSchema-BRzzvs9t.js}

@@ -1,7 +1,7 @@
 "use strict";
 const React = require("react");
 const admin = require("@strapi/strapi/admin");
-const index = require("./index-CodpLKZx.js");
+const index = require("./index-R3ReZXF1.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });

package/dist/_chunks/{useHubspotSchema-BsmQgJgx.mjs → useHubspotSchema-Bz2o1BU-.mjs}

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { useFetchClient } from "@strapi/strapi/admin";
-import { P as PLUGIN_ID } from "./index-7cL9PRh1.mjs";
+import { P as PLUGIN_ID } from "./index-CLAy5dVN.mjs";
 let cached = null;
 let inFlight = null;
 const listeners = /* @__PURE__ */ new Set();

package/dist/admin/index.js

@@ -1,4 +1,4 @@
 "use strict";
-const index = require("../_chunks/index-CodpLKZx.js");
+const index = require("../_chunks/index-R3ReZXF1.js");
 require("@strapi/icons");
 module.exports = index.index;

package/dist/admin/index.mjs

@@ -1,4 +1,4 @@
-import { i } from "../_chunks/index-7cL9PRh1.mjs";
+import { i } from "../_chunks/index-CLAy5dVN.mjs";
 import "@strapi/icons";
 export {
   i as default

package/dist/admin/src/builder/Sortable.d.ts

@@ -1,25 +1,38 @@
 import * as React from "react";
-import { arrayMove } from "@dnd-kit/sortable";
-export { arrayMove };
+import { type DragEndEvent } from "@dnd-kit/core";
+import { arrayMove, relocateField } from "./relocateField";
+export { arrayMove, relocateField };
+export type { DragEndEvent };
 /** The drag-handle props to spread on the grip element. */
 export interface HandleProps {
     attributes: React.HTMLAttributes<HTMLElement>;
     listeners: Record<string, unknown> | undefined;
 }
-/**
- * One vertical sortable list. Each list gets its OWN DndContext: steps sort
- * among steps, a step's fields sort among themselves — no cross-container
- * ambiguity, and the arrow buttons keep covering cross-step moves (they also
- * stay the accessible path).
- */
-export declare function SortableList({ ids, onReorder, children, }: {
+export type SortableData = {
+    type: "step";
+} | {
+    type: "field";
+    stepId: string;
+} | {
+    type: "container";
+    stepId: string;
+};
+export declare function SortableBoard({ children, onDragEnd, }: {
+    children: React.ReactNode;
+    onDragEnd: (event: DragEndEvent) => void;
+}): React.JSX.Element;
+export declare function SortableGroup({ ids, children, }: {
     ids: string[];
-    /** Called with the reordered ids after a completed drag. */
-    onReorder: (ids: string[]) => void;
+    children: React.ReactNode;
+}): React.JSX.Element;
+/** Drop target for a step's field list — including when the list is empty. */
+export declare function SortableContainer({ stepId, children, }: {
+    stepId: string;
     children: React.ReactNode;
 }): React.JSX.Element;
 /** A sortable row: wraps the card, hands the grip props to its children. */
-export declare function SortableItem({ id, children, }: {
+export declare function SortableItem({ id, data, children, }: {
     id: string;
+    data?: SortableData;
     children: (handle: HandleProps) => React.ReactNode;
 }): React.JSX.Element;

package/dist/admin/src/builder/__tests__/relocateField.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/admin/src/builder/relocateField.d.ts

@@ -0,0 +1,14 @@
+import { arrayMove } from "@dnd-kit/sortable";
+export { arrayMove };
+/**
+ * Move `fieldId` onto `overId` across steps.
+ *
+ * `overId` is another field (insert at that index), a step id (append),
+ * or `container:${stepId}` (the empty-area droppable of that step).
+ */
+export declare function relocateField<S extends {
+    id: string;
+    fields: F[];
+}, F extends {
+    id: string;
+}>(steps: S[], fieldId: string, overId: string): S[];

package/dist/server/index.js

@@ -1778,6 +1778,65 @@ function convertHubspotForm(raw) {
     skipped
   };
 }
+function mappingKey(field) {
+  const mapping = field.hubspot ?? {};
+  const property = mapping.property?.trim();
+  if (!property) return null;
+  return `${mapping.object?.trim() || "contact"}:${property}`;
+}
+function uniqueName(base, used) {
+  if (!used.has(base)) return base;
+  let n = 2;
+  while (used.has(`${base}_${n}`)) n += 1;
+  return `${base}_${n}`;
+}
+function mergeHubspotImport(current, incoming) {
+  const steps = (current.steps ?? []).map((step) => ({
+    ...step,
+    fields: [...step.fields ?? []]
+  }));
+  if (!steps.length) {
+    steps.push({ id: makeId$1("stp"), fields: [] });
+  }
+  const byKey = /* @__PURE__ */ new Map();
+  const usedNames = /* @__PURE__ */ new Set();
+  for (const step of steps) {
+    for (const field of step.fields) {
+      usedNames.add(field.name);
+      const key = mappingKey(field);
+      if (key) byKey.set(key, field);
+    }
+  }
+  const added = [];
+  const updated = [];
+  const incomingFields = (incoming.steps ?? []).flatMap((step) => step.fields ?? []);
+  for (const next of incomingFields) {
+    const key = mappingKey(next);
+    const existing = key ? byKey.get(key) : void 0;
+    if (existing) {
+      existing.label = next.label;
+      existing.type = next.type;
+      existing.required = next.required;
+      existing.placeholder = next.placeholder;
+      existing.helpText = next.helpText;
+      if (next.options) existing.options = next.options;
+      else delete existing.options;
+      if (!existing.visibleIf && next.visibleIf) existing.visibleIf = next.visibleIf;
+      updated.push(key);
+      continue;
+    }
+    const field = {
+      ...next,
+      id: makeId$1("fld"),
+      name: uniqueName(next.name, usedNames)
+    };
+    usedNames.add(field.name);
+    if (key) byKey.set(key, field);
+    steps[steps.length - 1].fields.push(field);
+    added.push(key || field.name);
+  }
+  return { definition: { version: 1, steps }, added, updated };
+}
 async function hsGet(apiKey, path) {
   const res = await fetch(`${HS_BASE$2}${path}`, {
     headers: { Authorization: `Bearer ${apiKey}` }
@@ -2895,9 +2954,9 @@ function createFormsAdminController(strapi) {
     },
     /**
      * Converts one portal form into a plugin form draft, in the current
-     * locale. Slug derived from the HubSpot name: re-importing the same form
-     * overwrites the draft — never the published version, never the portal.
-     * What the builder can't express is skipped and returned in `skipped`.
+     * locale. Matching prefers the linked HubSpot GUID, then the slug.
+     * Re-importing merges: mapped fields update in place, new ones append,
+     * Strapi steps stay. Never the published version, never the portal.
      */
     async runHubspotImport(ctx) {
       const formId = ctx.request.body?.formId;
@@ -2916,24 +2975,81 @@ function createFormsAdminController(strapi) {
       const { skipped, definition, ...meta } = converted;
       const slug = slugify(name);
       const existing = await documents().findFirst({
+        filters: { hubspotFormId: formId }
+      }) ?? await documents().findFirst({
         filters: { slug }
       });
-      let documentId;
       if (existing) {
-        await documents().update({
+        const current = await documents().findOne({
           documentId: existing.documentId,
           locale: ctx.query.locale,
-          data: { ...meta, name, definition }
+          status: "draft"
         });
-        documentId = existing.documentId;
-      } else {
-        const created = await documents().create({
+        const merged = mergeHubspotImport(current?.definition ?? EMPTY_DEFINITION, definition);
+        await documents().update({
+          documentId: existing.documentId,
           locale: ctx.query.locale,
-          data: { ...meta, name, slug, definition }
+          data: {
+            hubspotFormId: meta.hubspotFormId ?? formId,
+            definition: merged.definition
+          }
         });
-        documentId = created.documentId;
+        ctx.body = {
+          documentId: existing.documentId,
+          skipped,
+          added: merged.added,
+          updated: merged.updated
+        };
+        return;
+      }
+      const created = await documents().create({
+        locale: ctx.query.locale,
+        data: { ...meta, name, slug, definition }
+      });
+      ctx.body = { documentId: created.documentId, skipped, added: [], updated: [] };
+    },
+    /**
+     * Pull the linked HubSpot marketing form back into this draft: mapped
+     * fields update in place, new ones append, Strapi steps and extras stay.
+     */
+    async resync(ctx) {
+      const entry = await documents().findOne({
+        documentId: ctx.params.documentId,
+        locale: ctx.query.locale,
+        status: "draft"
+      });
+      if (!entry) ctx.throw(404, "Form not found");
+      const guid = typeof entry.hubspotFormId === "string" ? entry.hubspotFormId.trim() : "";
+      if (!isFormGuid(guid)) {
+        ctx.throw(400, "This form is not linked to a HubSpot marketing form.");
+      }
+      const { apiKey } = await resolveApiKey(strapi);
+      if (!apiKey) ctx.throw(400, "No HubSpot API key configured");
+      let converted;
+      try {
+        converted = convertHubspotForm(await fetchHubspotForm(apiKey, guid));
+      } catch (err) {
+        strapi.log.warn(`[hubspot] form resync failed — ${err.message}`);
+        ctx.throw(502, err.message || "Cannot reach HubSpot");
+        return;
       }
-      ctx.body = { documentId, skipped };
+      const merged = mergeHubspotImport(entry.definition ?? EMPTY_DEFINITION, converted.definition);
+      await documents().update({
+        documentId: ctx.params.documentId,
+        locale: ctx.query.locale,
+        data: { definition: merged.definition }
+      });
+      const form = await documents().findOne({
+        documentId: ctx.params.documentId,
+        locale: ctx.query.locale,
+        status: "draft"
+      });
+      ctx.body = {
+        form,
+        added: merged.added,
+        updated: merged.updated,
+        skipped: converted.skipped
+      };
     },
     /**
      * Copies a form (every locale of its draft) into a new draft document —
@@ -3472,6 +3588,7 @@ const routes = {
       adminRoute("POST", "/builder/forms/:documentId/unpublish", "formsAdmin.unpublish", [FORMS_ACTION]),
       adminRoute("DELETE", "/builder/forms/:documentId", "formsAdmin.remove", [FORMS_ACTION]),
       adminRoute("POST", "/builder/forms/:documentId/duplicate", "formsAdmin.duplicate", [FORMS_ACTION]),
+      adminRoute("POST", "/builder/forms/:documentId/resync", "formsAdmin.resync", [FORMS_ACTION]),
       // No FORMS_ACTION: editors pick forms from the Content Manager, like
       // they pick properties — the builder itself stays gated.
       adminRoute("GET", "/forms-options", "formsAdmin.options"),

package/dist/server/index.mjs

@@ -1777,6 +1777,65 @@ function convertHubspotForm(raw) {
     skipped
   };
 }
+function mappingKey(field) {
+  const mapping = field.hubspot ?? {};
+  const property = mapping.property?.trim();
+  if (!property) return null;
+  return `${mapping.object?.trim() || "contact"}:${property}`;
+}
+function uniqueName(base, used) {
+  if (!used.has(base)) return base;
+  let n = 2;
+  while (used.has(`${base}_${n}`)) n += 1;
+  return `${base}_${n}`;
+}
+function mergeHubspotImport(current, incoming) {
+  const steps = (current.steps ?? []).map((step) => ({
+    ...step,
+    fields: [...step.fields ?? []]
+  }));
+  if (!steps.length) {
+    steps.push({ id: makeId$1("stp"), fields: [] });
+  }
+  const byKey = /* @__PURE__ */ new Map();
+  const usedNames = /* @__PURE__ */ new Set();
+  for (const step of steps) {
+    for (const field of step.fields) {
+      usedNames.add(field.name);
+      const key = mappingKey(field);
+      if (key) byKey.set(key, field);
+    }
+  }
+  const added = [];
+  const updated = [];
+  const incomingFields = (incoming.steps ?? []).flatMap((step) => step.fields ?? []);
+  for (const next of incomingFields) {
+    const key = mappingKey(next);
+    const existing = key ? byKey.get(key) : void 0;
+    if (existing) {
+      existing.label = next.label;
+      existing.type = next.type;
+      existing.required = next.required;
+      existing.placeholder = next.placeholder;
+      existing.helpText = next.helpText;
+      if (next.options) existing.options = next.options;
+      else delete existing.options;
+      if (!existing.visibleIf && next.visibleIf) existing.visibleIf = next.visibleIf;
+      updated.push(key);
+      continue;
+    }
+    const field = {
+      ...next,
+      id: makeId$1("fld"),
+      name: uniqueName(next.name, usedNames)
+    };
+    usedNames.add(field.name);
+    if (key) byKey.set(key, field);
+    steps[steps.length - 1].fields.push(field);
+    added.push(key || field.name);
+  }
+  return { definition: { version: 1, steps }, added, updated };
+}
 async function hsGet(apiKey, path) {
   const res = await fetch(`${HS_BASE$2}${path}`, {
     headers: { Authorization: `Bearer ${apiKey}` }
@@ -2894,9 +2953,9 @@ function createFormsAdminController(strapi) {
     },
     /**
      * Converts one portal form into a plugin form draft, in the current
-     * locale. Slug derived from the HubSpot name: re-importing the same form
-     * overwrites the draft — never the published version, never the portal.
-     * What the builder can't express is skipped and returned in `skipped`.
+     * locale. Matching prefers the linked HubSpot GUID, then the slug.
+     * Re-importing merges: mapped fields update in place, new ones append,
+     * Strapi steps stay. Never the published version, never the portal.
      */
     async runHubspotImport(ctx) {
       const formId = ctx.request.body?.formId;
@@ -2915,24 +2974,81 @@ function createFormsAdminController(strapi) {
       const { skipped, definition, ...meta } = converted;
       const slug = slugify(name);
       const existing = await documents().findFirst({
+        filters: { hubspotFormId: formId }
+      }) ?? await documents().findFirst({
         filters: { slug }
       });
-      let documentId;
       if (existing) {
-        await documents().update({
+        const current = await documents().findOne({
           documentId: existing.documentId,
           locale: ctx.query.locale,
-          data: { ...meta, name, definition }
+          status: "draft"
         });
-        documentId = existing.documentId;
-      } else {
-        const created = await documents().create({
+        const merged = mergeHubspotImport(current?.definition ?? EMPTY_DEFINITION, definition);
+        await documents().update({
+          documentId: existing.documentId,
           locale: ctx.query.locale,
-          data: { ...meta, name, slug, definition }
+          data: {
+            hubspotFormId: meta.hubspotFormId ?? formId,
+            definition: merged.definition
+          }
         });
-        documentId = created.documentId;
+        ctx.body = {
+          documentId: existing.documentId,
+          skipped,
+          added: merged.added,
+          updated: merged.updated
+        };
+        return;
+      }
+      const created = await documents().create({
+        locale: ctx.query.locale,
+        data: { ...meta, name, slug, definition }
+      });
+      ctx.body = { documentId: created.documentId, skipped, added: [], updated: [] };
+    },
+    /**
+     * Pull the linked HubSpot marketing form back into this draft: mapped
+     * fields update in place, new ones append, Strapi steps and extras stay.
+     */
+    async resync(ctx) {
+      const entry = await documents().findOne({
+        documentId: ctx.params.documentId,
+        locale: ctx.query.locale,
+        status: "draft"
+      });
+      if (!entry) ctx.throw(404, "Form not found");
+      const guid = typeof entry.hubspotFormId === "string" ? entry.hubspotFormId.trim() : "";
+      if (!isFormGuid(guid)) {
+        ctx.throw(400, "This form is not linked to a HubSpot marketing form.");
+      }
+      const { apiKey } = await resolveApiKey(strapi);
+      if (!apiKey) ctx.throw(400, "No HubSpot API key configured");
+      let converted;
+      try {
+        converted = convertHubspotForm(await fetchHubspotForm(apiKey, guid));
+      } catch (err) {
+        strapi.log.warn(`[hubspot] form resync failed — ${err.message}`);
+        ctx.throw(502, err.message || "Cannot reach HubSpot");
+        return;
       }
-      ctx.body = { documentId, skipped };
+      const merged = mergeHubspotImport(entry.definition ?? EMPTY_DEFINITION, converted.definition);
+      await documents().update({
+        documentId: ctx.params.documentId,
+        locale: ctx.query.locale,
+        data: { definition: merged.definition }
+      });
+      const form = await documents().findOne({
+        documentId: ctx.params.documentId,
+        locale: ctx.query.locale,
+        status: "draft"
+      });
+      ctx.body = {
+        form,
+        added: merged.added,
+        updated: merged.updated,
+        skipped: converted.skipped
+      };
     },
     /**
      * Copies a form (every locale of its draft) into a new draft document —
@@ -3471,6 +3587,7 @@ const routes = {
       adminRoute("POST", "/builder/forms/:documentId/unpublish", "formsAdmin.unpublish", [FORMS_ACTION]),
       adminRoute("DELETE", "/builder/forms/:documentId", "formsAdmin.remove", [FORMS_ACTION]),
       adminRoute("POST", "/builder/forms/:documentId/duplicate", "formsAdmin.duplicate", [FORMS_ACTION]),
+      adminRoute("POST", "/builder/forms/:documentId/resync", "formsAdmin.resync", [FORMS_ACTION]),
       // No FORMS_ACTION: editors pick forms from the Content Manager, like
       // they pick properties — the builder itself stays gated.
       adminRoute("GET", "/forms-options", "formsAdmin.options"),