strapi-plugin-hubspot 0.16.1 → 0.16.2

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+## 0.16.2 — 2026-09-22
+
+### Added
+- **Resync from HubSpot** in the form editor (and a safer list re-import):
+  mapped fields update in place (label, type, required, options), new HubSpot
+  fields append to the last step, Strapi steps / conditions / extra fields
+  stay. Matching uses the linked form GUID rather than the slug.
+
 ## 0.16.1 — 2026-09-22
 
 ### Changed

package/README.md

@@ -174,10 +174,10 @@ the portal. The translation carries over what the builder can express:
 - dependent fields become `visibleIf` conditions (value lists are expanded
   into OR'd/AND'd rules).
 
-Everything else — file uploads, hidden fields, content blocks, GDPR consent
-blocks, an operator with no equivalent — is **skipped and reported** after the
-import, so nothing is silently half-migrated. The HubSpot original is never
-modified; re-importing overwrites the draft, never the published version.
+The HubSpot original is never modified. Re-importing (or **Resync from HubSpot**
+in the editor) updates mapped fields in place and appends new ones — Strapi
+steps, conditions and extra fields stay. Matching is by HubSpot form GUID,
+then slug. The published version is never touched.
 
 ### i18n and publishing
 

package/dist/_chunks/{Forms-DEoZGrEt.mjs → Forms-BOQWely0.mjs}

@@ -5,12 +5,12 @@ import { u as useIntl } from "./index-CEh8vkxY.mjs";
 import { Typography, Flex, Box, SingleSelect, SingleSelectOption, MultiSelect, MultiSelectOption, TextInput, IconButton, Button, Combobox, ComboboxOption, Field, Textarea, Checkbox, Divider, Loader, Badge, Table, Thead, Tr, Th, Tbody, Td, Modal } from "@strapi/design-system";
 import { Trash, Plus, ArrowClockwise, ArrowLeft, Drag, ArrowUp, ArrowDown, List, Duplicate, Download } from "@strapi/icons";
 import { useFetchClient } from "@strapi/strapi/admin";
-import { g as getTranslation, P as PLUGIN_ID } from "./index-gKM4jVf8.mjs";
+import { g as getTranslation, P as PLUGIN_ID } from "./index-CLAy5dVN.mjs";
 import { useSensors, useSensor, PointerSensor, KeyboardSensor, DndContext, useDroppable, closestCorners } from "@dnd-kit/core";
 import { arrayMove, sortableKeyboardCoordinates, SortableContext, verticalListSortingStrategy, useSortable } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
-import { o as objectLabel } from "./objectLabels-DQpSLUaJ.mjs";
-import { u as useHubspotSchema } from "./useHubspotSchema-CE7tJgOM.mjs";
+import { o as objectLabel } from "./objectLabels--zOmqsfm.mjs";
+import { u as useHubspotSchema } from "./useHubspotSchema-Bz2o1BU-.mjs";
 const OPERATORS = [
   "eq",
   "neq",
@@ -899,6 +899,40 @@ const FormEditor = () => {
       setBusy(false);
     }
   };
+  const resync = async () => {
+    if (dirty && !await save()) return;
+    setBusy(true);
+    setFeedback(null);
+    try {
+      const { data } = await post(`/${PLUGIN_ID}/builder/forms/${documentId}/resync${query}`);
+      if (data.form) {
+        setEntry(data.form);
+        setDirty(false);
+      }
+      const added = data.added?.length ?? 0;
+      const updated = data.updated?.length ?? 0;
+      const skipped = data.skipped?.length ?? 0;
+      setFeedback({
+        tone: "success",
+        text: skipped > 0 ? t(
+          "editor.resynced-gaps",
+          "Resynced from HubSpot — {updated, plural, one {# updated} other {# updated}}, {added, plural, one {# added} other {# added}}, {skipped, plural, one {# skipped} other {# skipped}}.",
+          { updated, added, skipped }
+        ) : t(
+          "editor.resynced",
+          "Resynced from HubSpot — {updated, plural, one {# field updated} other {# fields updated}}, {added, plural, one {# added} other {# added}}.",
+          { updated, added }
+        )
+      });
+    } catch {
+      setFeedback({
+        tone: "danger",
+        text: t("editor.resync-error", "Could not resync from HubSpot — is the form still linked?")
+      });
+    } finally {
+      setBusy(false);
+    }
+  };
   const fieldFlags = (fieldId) => ({
     error: errors.find((e) => e.fieldId === fieldId),
     problem: problems.find((p) => p.fieldId === fieldId)
@@ -936,6 +970,15 @@ const FormEditor = () => {
           }
         ),
         /* @__PURE__ */ jsx(Button, { variant: "secondary", onClick: save, disabled: busy || !dirty, children: t("editor.save", "Save") }),
+        /* @__PURE__ */ jsx(
+          Button,
+          {
+            variant: "tertiary",
+            onClick: resync,
+            disabled: busy || !entry.hubspotFormId,
+            children: t("editor.resync", "Resync from HubSpot")
+          }
+        ),
         /* @__PURE__ */ jsx(Button, { onClick: publish, disabled: busy, children: t("editor.publish", "Publish") }),
         published && /* @__PURE__ */ jsx(Button, { variant: "tertiary", onClick: unpublish, disabled: busy, children: t("editor.unpublish", "Unpublish") })
       ] })
@@ -1311,7 +1354,7 @@ const FormEditor = () => {
           ),
           /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: t(
             "editor.hubspot-form-hint",
-            "Submissions go through HubSpot’s Forms API so they count as conversions. Switch the connected portal (test → production) and pick the matching form — nothing is hardcoded."
+            "Submissions go through HubSpot’s Forms API so they count as conversions. After you change the form in HubSpot, use Resync from HubSpot — mapped fields update in place, new ones are appended, your steps stay."
           ) })
         ] }),
         /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: t(
@@ -1490,7 +1533,7 @@ const FormsList = () => {
           /* @__PURE__ */ jsx(Typography, { variant: "delta", tag: "h2", children: t("forms.import-hubspot-title", "Import from your HubSpot portal") }),
           /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", tag: "p", children: t(
             "forms.import-hubspot-hint",
-            "Translates a form built in HubSpot into a draft here, CRM mapping included. What the builder can't express is skipped and reported. Re-importing overwrites the draft."
+            "Translates a form built in HubSpot into a draft here, CRM mapping included. What the builder can't express is skipped and reported. Re-importing updates mapped fields in place and appends new ones."
           ) })
         ] }),
         /* @__PURE__ */ jsxs(Flex, { gap: 2, children: [

package/dist/_chunks/{Forms-D0QXkYAN.js → Forms-mMNP7hc9.js}

@@ -7,12 +7,12 @@ const index = require("./index-DkTxsEqL.js");
 const designSystem = require("@strapi/design-system");
 const icons = require("@strapi/icons");
 const admin = require("@strapi/strapi/admin");
-const index$1 = require("./index-ciliGv0E.js");
+const index$1 = require("./index-R3ReZXF1.js");
 const core = require("@dnd-kit/core");
 const sortable = require("@dnd-kit/sortable");
 const utilities = require("@dnd-kit/utilities");
-const objectLabels = require("./objectLabels-BjYfdhRB.js");
-const useHubspotSchema = require("./useHubspotSchema-KKVppjC2.js");
+const objectLabels = require("./objectLabels-CW2iBOkD.js");
+const useHubspotSchema = require("./useHubspotSchema-BRzzvs9t.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
@@ -919,6 +919,40 @@ const FormEditor = () => {
       setBusy(false);
     }
   };
+  const resync = async () => {
+    if (dirty && !await save()) return;
+    setBusy(true);
+    setFeedback(null);
+    try {
+      const { data } = await post(`/${index$1.PLUGIN_ID}/builder/forms/${documentId}/resync${query}`);
+      if (data.form) {
+        setEntry(data.form);
+        setDirty(false);
+      }
+      const added = data.added?.length ?? 0;
+      const updated = data.updated?.length ?? 0;
+      const skipped = data.skipped?.length ?? 0;
+      setFeedback({
+        tone: "success",
+        text: skipped > 0 ? t(
+          "editor.resynced-gaps",
+          "Resynced from HubSpot — {updated, plural, one {# updated} other {# updated}}, {added, plural, one {# added} other {# added}}, {skipped, plural, one {# skipped} other {# skipped}}.",
+          { updated, added, skipped }
+        ) : t(
+          "editor.resynced",
+          "Resynced from HubSpot — {updated, plural, one {# field updated} other {# fields updated}}, {added, plural, one {# added} other {# added}}.",
+          { updated, added }
+        )
+      });
+    } catch {
+      setFeedback({
+        tone: "danger",
+        text: t("editor.resync-error", "Could not resync from HubSpot — is the form still linked?")
+      });
+    } finally {
+      setBusy(false);
+    }
+  };
   const fieldFlags = (fieldId) => ({
     error: errors.find((e) => e.fieldId === fieldId),
     problem: problems.find((p) => p.fieldId === fieldId)
@@ -956,6 +990,15 @@ const FormEditor = () => {
           }
         ),
         /* @__PURE__ */ jsxRuntime.jsx(designSystem.Button, { variant: "secondary", onClick: save, disabled: busy || !dirty, children: t("editor.save", "Save") }),
+        /* @__PURE__ */ jsxRuntime.jsx(
+          designSystem.Button,
+          {
+            variant: "tertiary",
+            onClick: resync,
+            disabled: busy || !entry.hubspotFormId,
+            children: t("editor.resync", "Resync from HubSpot")
+          }
+        ),
         /* @__PURE__ */ jsxRuntime.jsx(designSystem.Button, { onClick: publish, disabled: busy, children: t("editor.publish", "Publish") }),
         published && /* @__PURE__ */ jsxRuntime.jsx(designSystem.Button, { variant: "tertiary", onClick: unpublish, disabled: busy, children: t("editor.unpublish", "Unpublish") })
       ] })
@@ -1331,7 +1374,7 @@ const FormEditor = () => {
           ),
           /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "pi", textColor: "neutral600", children: t(
             "editor.hubspot-form-hint",
-            "Submissions go through HubSpot’s Forms API so they count as conversions. Switch the connected portal (test → production) and pick the matching form — nothing is hardcoded."
+            "Submissions go through HubSpot’s Forms API so they count as conversions. After you change the form in HubSpot, use Resync from HubSpot — mapped fields update in place, new ones are appended, your steps stay."
           ) })
         ] }),
         /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "pi", textColor: "neutral600", children: t(
@@ -1510,7 +1553,7 @@ const FormsList = () => {
           /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "delta", tag: "h2", children: t("forms.import-hubspot-title", "Import from your HubSpot portal") }),
           /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "pi", textColor: "neutral600", tag: "p", children: t(
             "forms.import-hubspot-hint",
-            "Translates a form built in HubSpot into a draft here, CRM mapping included. What the builder can't express is skipped and reported. Re-importing overwrites the draft."
+            "Translates a form built in HubSpot into a draft here, CRM mapping included. What the builder can't express is skipped and reported. Re-importing updates mapped fields in place and appends new ones."
           ) })
         ] }),
         /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Flex, { gap: 2, children: [

package/dist/_chunks/{HubspotFormInput-CPep55GL.mjs → HubspotFormInput-DCkoavrN.mjs}

@@ -3,7 +3,7 @@ import * as React from "react";
 import { u as useIntl } from "./index-CEh8vkxY.mjs";
 import { Field, Flex, Loader, Combobox, ComboboxOption } from "@strapi/design-system";
 import { useFetchClient } from "@strapi/strapi/admin";
-import { P as PLUGIN_ID, g as getTranslation } from "./index-gKM4jVf8.mjs";
+import { P as PLUGIN_ID, g as getTranslation } from "./index-CLAy5dVN.mjs";
 const HubspotFormInput = React.forwardRef(
   ({ name, value, onChange, disabled, error, required, label, hint, labelAction }, ref) => {
     const { formatMessage } = useIntl();

package/dist/_chunks/{HubspotFormInput-4ZMYXWM_.js → HubspotFormInput-DI35Aqiu.js}

@@ -5,7 +5,7 @@ const React = require("react");
 const index = require("./index-DkTxsEqL.js");
 const designSystem = require("@strapi/design-system");
 const admin = require("@strapi/strapi/admin");
-const index$1 = require("./index-ciliGv0E.js");
+const index$1 = 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/{HubspotObjectInput-CQszIx1W.mjs → HubspotObjectInput-BbnvhdbD.mjs}

@@ -2,9 +2,9 @@ import { jsxs, jsx } from "react/jsx-runtime";
 import * as React from "react";
 import { u as useIntl } from "./index-CEh8vkxY.mjs";
 import { Field, Flex, Loader, SingleSelect, SingleSelectOption } from "@strapi/design-system";
-import { g as getTranslation } from "./index-gKM4jVf8.mjs";
-import { o as objectLabel } from "./objectLabels-DQpSLUaJ.mjs";
-import { u as useHubspotSchema } from "./useHubspotSchema-CE7tJgOM.mjs";
+import { g as getTranslation } from "./index-CLAy5dVN.mjs";
+import { o as objectLabel } from "./objectLabels--zOmqsfm.mjs";
+import { u as useHubspotSchema } from "./useHubspotSchema-Bz2o1BU-.mjs";
 const HubspotObjectInput = React.forwardRef(
   ({ name, value, onChange, disabled, error, required, label, hint, labelAction }, ref) => {
     const intl = useIntl();

package/dist/_chunks/{HubspotObjectInput-BTqYXJIa.js → HubspotObjectInput-Cq1TuL_l.js}

@@ -4,9 +4,9 @@ const jsxRuntime = require("react/jsx-runtime");
 const React = require("react");
 const index = require("./index-DkTxsEqL.js");
 const designSystem = require("@strapi/design-system");
-const index$1 = require("./index-ciliGv0E.js");
-const objectLabels = require("./objectLabels-BjYfdhRB.js");
-const useHubspotSchema = require("./useHubspotSchema-KKVppjC2.js");
+const index$1 = require("./index-R3ReZXF1.js");
+const objectLabels = require("./objectLabels-CW2iBOkD.js");
+const useHubspotSchema = require("./useHubspotSchema-BRzzvs9t.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });

package/dist/_chunks/{HubspotPropertyInput-ClNph0f1.mjs → HubspotPropertyInput-BHfpBD36.mjs}

@@ -4,9 +4,9 @@ import { u as useIntl } from "./index-CEh8vkxY.mjs";
 import { Field, Flex, Loader, Combobox, ComboboxOption, IconButton, Button, Typography, Link } from "@strapi/design-system";
 import { ArrowClockwise } from "@strapi/icons";
 import { useField } from "@strapi/strapi/admin";
-import { g as getTranslation } from "./index-gKM4jVf8.mjs";
-import { o as objectLabel } from "./objectLabels-DQpSLUaJ.mjs";
-import { u as useHubspotSchema } from "./useHubspotSchema-CE7tJgOM.mjs";
+import { g as getTranslation } from "./index-CLAy5dVN.mjs";
+import { o as objectLabel } from "./objectLabels--zOmqsfm.mjs";
+import { u as useHubspotSchema } from "./useHubspotSchema-Bz2o1BU-.mjs";
 const oneLine = {
   display: "block",
   whiteSpace: "nowrap",

package/dist/_chunks/{HubspotPropertyInput-2MgIKlR_.js → HubspotPropertyInput-BLZzsW08.js}

@@ -6,9 +6,9 @@ const index = require("./index-DkTxsEqL.js");
 const designSystem = require("@strapi/design-system");
 const icons = require("@strapi/icons");
 const admin = require("@strapi/strapi/admin");
-const index$1 = require("./index-ciliGv0E.js");
-const objectLabels = require("./objectLabels-BjYfdhRB.js");
-const useHubspotSchema = require("./useHubspotSchema-KKVppjC2.js");
+const index$1 = require("./index-R3ReZXF1.js");
+const objectLabels = require("./objectLabels-CW2iBOkD.js");
+const useHubspotSchema = require("./useHubspotSchema-BRzzvs9t.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });

package/dist/_chunks/{Settings-DhiHQC6U.js → Settings-BAsx0LGv.js}

@@ -5,9 +5,9 @@ const React = require("react");
 const index = require("./index-DkTxsEqL.js");
 const designSystem = require("@strapi/design-system");
 const admin = require("@strapi/strapi/admin");
-const index$1 = require("./index-ciliGv0E.js");
+const index$1 = require("./index-R3ReZXF1.js");
 const reactRouterDom = require("react-router-dom");
-const objectLabels = require("./objectLabels-BjYfdhRB.js");
+const objectLabels = require("./objectLabels-CW2iBOkD.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });

package/dist/_chunks/{Settings-CZ-qQSKT.mjs → Settings-DqRpHtnT.mjs}

@@ -3,9 +3,9 @@ import * as React from "react";
 import { u as useIntl } from "./index-CEh8vkxY.mjs";
 import { Flex, Divider, Typography, Button, Box, Link, Badge, Loader, Field, SingleSelect, SingleSelectOption, Checkbox } from "@strapi/design-system";
 import { useFetchClient } from "@strapi/strapi/admin";
-import { g as getTranslation, P as PLUGIN_ID } from "./index-gKM4jVf8.mjs";
+import { g as getTranslation, P as PLUGIN_ID } from "./index-CLAy5dVN.mjs";
 import { Link as Link$1 } from "react-router-dom";
-import { o as objectLabel } from "./objectLabels-DQpSLUaJ.mjs";
+import { o as objectLabel } from "./objectLabels--zOmqsfm.mjs";
 const AuditSection = ({ configured }) => {
   const intl = useIntl();
   const { formatMessage } = intl;

package/dist/_chunks/{en-Dh3bMS6N.mjs → en-Djd3TID0.mjs}

@@ -164,7 +164,11 @@ const en = {
   "editor.hubspot-form": "HubSpot marketing form",
   "editor.hubspot-form-placeholder": "Pick a form of the connected portal",
   "editor.hubspot-form-none": "None — CRM upsert only",
-  "editor.hubspot-form-hint": "Submissions go through HubSpot’s Forms API so they count as conversions. Switch the connected portal (test → production) and pick the matching form — nothing is hardcoded.",
+  "editor.hubspot-form-hint": "Submissions go through HubSpot’s Forms API so they count as conversions. After you change the form in HubSpot, use Resync from HubSpot — mapped fields update in place, new ones are appended, your steps stay.",
+  "editor.resync": "Resync from HubSpot",
+  "editor.resynced": "Resynced from HubSpot — {updated, plural, one {# field updated} other {# fields updated}}, {added, plural, one {# added} other {# added}}.",
+  "editor.resynced-gaps": "Resynced from HubSpot — {updated, plural, one {# updated} other {# updated}}, {added, plural, one {# added} other {# added}}, {skipped, plural, one {# skipped} other {# skipped}}.",
+  "editor.resync-error": "Could not resync from HubSpot — is the form still linked?",
   "editor.form-hint": "Select a step or a field to edit it. The public endpoint serves this form at /api/hubspot/forms/{slug}.",
   "panel.label": "Label",
   "panel.name": "Payload key",
@@ -234,7 +238,7 @@ const en = {
   "forms.col-submissions": "Submissions",
   "forms.submissions": "Submissions",
   "forms.import-hubspot-title": "Import from your HubSpot portal",
-  "forms.import-hubspot-hint": "Translates a form built in HubSpot into a draft here, CRM mapping included. What the builder can't express is skipped and reported. Re-importing overwrites the draft.",
+  "forms.import-hubspot-hint": "Translates a form built in HubSpot into a draft here, CRM mapping included. What the builder can't express is skipped and reported. Re-importing updates mapped fields in place and appends new ones.",
   "forms.import-hubspot-source": "HubSpot form to import",
   "forms.hubspot-list-error": "Could not list the portal's forms — the token needs the `forms` read scope.",
   "forms.report-title": "Imported with gaps",

package/dist/_chunks/{en-CSgFmKmM.js → en-sfzopB5K.js}

@@ -166,7 +166,11 @@ const en = {
   "editor.hubspot-form": "HubSpot marketing form",
   "editor.hubspot-form-placeholder": "Pick a form of the connected portal",
   "editor.hubspot-form-none": "None — CRM upsert only",
-  "editor.hubspot-form-hint": "Submissions go through HubSpot’s Forms API so they count as conversions. Switch the connected portal (test → production) and pick the matching form — nothing is hardcoded.",
+  "editor.hubspot-form-hint": "Submissions go through HubSpot’s Forms API so they count as conversions. After you change the form in HubSpot, use Resync from HubSpot — mapped fields update in place, new ones are appended, your steps stay.",
+  "editor.resync": "Resync from HubSpot",
+  "editor.resynced": "Resynced from HubSpot — {updated, plural, one {# field updated} other {# fields updated}}, {added, plural, one {# added} other {# added}}.",
+  "editor.resynced-gaps": "Resynced from HubSpot — {updated, plural, one {# updated} other {# updated}}, {added, plural, one {# added} other {# added}}, {skipped, plural, one {# skipped} other {# skipped}}.",
+  "editor.resync-error": "Could not resync from HubSpot — is the form still linked?",
   "editor.form-hint": "Select a step or a field to edit it. The public endpoint serves this form at /api/hubspot/forms/{slug}.",
   "panel.label": "Label",
   "panel.name": "Payload key",
@@ -236,7 +240,7 @@ const en = {
   "forms.col-submissions": "Submissions",
   "forms.submissions": "Submissions",
   "forms.import-hubspot-title": "Import from your HubSpot portal",
-  "forms.import-hubspot-hint": "Translates a form built in HubSpot into a draft here, CRM mapping included. What the builder can't express is skipped and reported. Re-importing overwrites the draft.",
+  "forms.import-hubspot-hint": "Translates a form built in HubSpot into a draft here, CRM mapping included. What the builder can't express is skipped and reported. Re-importing updates mapped fields in place and appends new ones.",
   "forms.import-hubspot-source": "HubSpot form to import",
   "forms.hubspot-list-error": "Could not list the portal's forms — the token needs the `forms` read scope.",
   "forms.report-title": "Imported with gaps",

package/dist/_chunks/{fr-aWOIOlS9.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",

package/dist/_chunks/{fr-D_EhZS0P.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",

package/dist/_chunks/{index-gKM4jVf8.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-DEoZGrEt.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-ClNph0f1.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-CQszIx1W.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-CPep55GL.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-CZ-qQSKT.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-Dh3bMS6N.mjs"), "./translations/fr.json": () => import("./fr-aWOIOlS9.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-ciliGv0E.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-D0QXkYAN.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-2MgIKlR_.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-BTqYXJIa.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-4ZMYXWM_.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-DhiHQC6U.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-CSgFmKmM.js")), "./translations/fr.json": () => Promise.resolve().then(() => require("./fr-D_EhZS0P.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-DQpSLUaJ.mjs → objectLabels--zOmqsfm.mjs}

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

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

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

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

@@ -1,7 +1,7 @@
 "use strict";
 const React = require("react");
 const admin = require("@strapi/strapi/admin");
-const index = require("./index-ciliGv0E.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-CE7tJgOM.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-gKM4jVf8.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-ciliGv0E.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-gKM4jVf8.mjs";
+import { i } from "../_chunks/index-CLAy5dVN.mjs";
 import "@strapi/icons";
 export {
   i as default

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"),

package/dist/server/src/formsAdmin.d.ts

@@ -50,11 +50,16 @@ export declare function createFormsAdminController(strapi: Core.Strapi): {
     listHubspotSources(ctx: Ctx): Promise<void>;
     /**
      * 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.
      */
     runHubspotImport(ctx: Ctx): Promise<void>;
+    /**
+     * Pull the linked HubSpot marketing form back into this draft: mapped
+     * fields update in place, new ones append, Strapi steps and extras stay.
+     */
+    resync(ctx: Ctx): Promise<void>;
     /**
      * Copies a form (every locale of its draft) into a new draft document —
      * the quickest way to A/B a variant or to start from an existing form.

package/dist/server/src/importHubspot.d.ts

@@ -79,6 +79,18 @@ export interface RawHubspotForm {
     } | null;
 }
 export declare function convertHubspotForm(raw: RawHubspotForm): ConvertedHubspotForm;
+export interface HubspotMergeResult {
+    definition: FormDefinition;
+    added: string[];
+    updated: string[];
+}
+/**
+ * Fold a freshly converted HubSpot form into an existing builder definition.
+ * Mapped fields are updated in place (label, type, required, options…) so
+ * Strapi steps, ids, conditions and extra fields survive. New HubSpot fields
+ * are appended to the last step. Nothing is deleted.
+ */
+export declare function mergeHubspotImport(current: FormDefinition, incoming: FormDefinition): HubspotMergeResult;
 /** Every regular form of the portal, name-sorted. Needs the `forms` scope. */
 export declare function listHubspotForms(apiKey: string): Promise<HubspotFormSummary[]>;
 /** One form, full definition. */

package/dist/server/src/index.d.ts

@@ -280,6 +280,7 @@ declare const _default: {
             runImport(ctx: import("./formsAdmin").Ctx): Promise<void>;
             listHubspotSources(ctx: import("./formsAdmin").Ctx): Promise<void>;
             runHubspotImport(ctx: import("./formsAdmin").Ctx): Promise<void>;
+            resync(ctx: import("./formsAdmin").Ctx): Promise<void>;
             duplicate(ctx: import("./formsAdmin").Ctx): Promise<void>;
             remove(ctx: import("./formsAdmin").Ctx): Promise<void>;
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-hubspot",
-  "version": "0.16.1",
+  "version": "0.16.2",
   "description": "The form builder for HubSpot in Strapi — multi-step forms with conditional fields mapped to real CRM properties, a public submit pipeline with retries, and save-time mapping validation.",
   "keywords": [
     "strapi",