strapi-plugin-hubspot 0.15.0 → 0.16.0

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

@@ -30,7 +30,18 @@ const fr = {
   "picker.refresh": "Rafraîchir les propriétés depuis HubSpot",
   "picker.import": "Importer les {count} options depuis HubSpot",
   "picker.imported": "Options importées — enregistrez pour les conserver.",
-  "settings.subtitle": "Jeton d'application privée et compte HubSpot qui reçoit les conversions. Passez du test à la prod ici — rien n'est figé dans le code.",
+  "settings.subtitle": "Jeton d'application privée, compte HubSpot, et la façon dont les envois atteignent le CRM. Passez du test à la prod ici — rien n'est figé dans le code.",
+  "settings.policy.title": "Comment les envois atteignent HubSpot",
+  "settings.policy.hint": "Choisissez la politique de ce portail. Les défauts restent sûrs pour toute install : conversion si un formulaire est lié, réponses en trop écrites sur le contact, formulaires HubSpot jamais mutés sauf si vous le demandez.",
+  "settings.mode.label": "Chemin d'envoi",
+  "settings.mode.hint": "Automatique utilise le formulaire marketing s'il est lié, sinon un upsert CRM. CRM seul ne compte jamais comme conversion. Formulaire marketing privilégie l'API Forms et retombe sur le CRM si HubSpot refuse l'envoi.",
+  "settings.mode.auto": "Automatique — conversion si un formulaire est lié, sinon CRM",
+  "settings.mode.forms": "Formulaire marketing — conversions HubSpot natives",
+  "settings.mode.crm": "CRM uniquement — upsert du contact, pas de conversion",
+  "settings.extra.label": "Après une conversion, écrire aussi sur le contact les champs mappés absents du formulaire HubSpot",
+  "settings.extra.hint": "L'API Forms écarte les champs inconnus (ils font échouer tout l'envoi). Activé, les champs restants atterrissent quand même sur le contact. Désactivez si HubSpot ne doit recevoir que ce que le formulaire marketing déclare.",
+  "settings.sync.label": "À la publication, ajouter au formulaire HubSpot les champs mappés manquants",
+  "settings.sync.hint": "Install Strapi-first : un champ ajouté ici apparaît sur le formulaire HubSpot à la publication suivante. Install HubSpot-first : laissez désactivé — l'import porte déjà les champs. Les propriétés CRM ne sont jamais créées ; mappez vers des propriétés déjà présentes dans le portail.",
   "settings.configured": "Configurée {hint}",
   "settings.not-configured": "Non configurée",
   "settings.source": "source : {source}",
@@ -62,7 +73,7 @@ const fr = {
   "settings.test-ok": "Connexion établie — {count} propriétés lisibles.",
   "settings.test-no-key": "Aucune clé configurée.",
   "settings.test-error": "HubSpot injoignable — clé invalide ou révoquée ?",
-  "settings.scopes": "Le jeton a besoin de crm.schemas.contacts.read, crm.schemas.companies.read et forms (lister et soumettre les formulaires marketing). Il n'est jamais renvoyé au navigateur.",
+  "settings.scopes": "Le jeton a besoin de crm.schemas.contacts.read, crm.schemas.companies.read et forms (lister, soumettre et éventuellement mettre à jour les formulaires marketing). Il n'est jamais renvoyé au navigateur.",
   "audit.title": "Audit des mappings",
   "audit.subtitle": "Parcourt toutes les entrées des content-types validés et liste les mappings que le portail refuserait aujourd'hui — y compris les propriétés supprimées dans HubSpot depuis leur enregistrement.",
   "audit.run": "Lancer l'audit",
@@ -122,6 +133,8 @@ const fr = {
   "editor.invalid": "La structure a des problèmes — voir les cartes signalées.",
   "editor.publish": "Publier",
   "editor.published": "Formulaire publié.",
+  "editor.published-synced": "Formulaire publié. {count, plural, one {# champ ajouté} other {# champs ajoutés}} au formulaire HubSpot.",
+  "editor.published-sync-warn": "Formulaire publié. La sync des champs HubSpot a échoué : {error}",
   "editor.publish-blocked": "Publication bloquée — corrigez d'abord les mappings signalés.",
   "editor.unpublish": "Dépublier",
   "editor.unpublished": "Formulaire dépublié.",

package/dist/_chunks/{index-BSJAhj8r.mjs → index-7cL9PRh1.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-B7eIm0Fi.mjs")).default
+      Component: async () => (await import("./Forms-6EoEYzAc.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-5bkDGmGo.mjs")
+        Input: async () => import("./HubspotPropertyInput-CrYP4pc0.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-ZZk_7hWq.mjs")
+        Input: async () => import("./HubspotObjectInput-DhsnSguG.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-cZAiaAaq.mjs")
+        Input: async () => import("./HubspotFormInput-V5w4y1fb.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-QcFbm3s5.mjs")).default
+          Component: async () => (await import("./Settings-CjcWj9I6.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-DMJeF7EN.mjs"), "./translations/fr.json": () => import("./fr-CVAntLmc.mjs") }), `./translations/${locale}.json`, 3);
+          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);
           return { data: prefixPluginTranslations(data), locale };
         } catch {
           return { data: {}, locale };

package/dist/_chunks/{index-BpcilDy1.js → index-CodpLKZx.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-ClyI4MJ1.js"))).default
+      Component: async () => (await Promise.resolve().then(() => require("./Forms-BW_zGc1P.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-v9B3wb1a.js"))
+        Input: async () => Promise.resolve().then(() => require("./HubspotPropertyInput-luFfnxqy.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-DWqk2C26.js"))
+        Input: async () => Promise.resolve().then(() => require("./HubspotObjectInput-Bmo6YQgs.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-Do7F83V6.js"))
+        Input: async () => Promise.resolve().then(() => require("./HubspotFormInput-oMhm1UJm.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-X3EHnTaO.js"))).default
+          Component: async () => (await Promise.resolve().then(() => require("./Settings-B3A22i7Z.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-ZHvaZLi7.js")), "./translations/fr.json": () => Promise.resolve().then(() => require("./fr-Ds_2EAzZ.js")) }), `./translations/${locale}.json`, 3);
+          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);
           return { data: prefixPluginTranslations(data), locale };
         } catch {
           return { data: {}, locale };

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

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

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

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

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

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

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

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

package/dist/admin/index.js

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

package/dist/admin/index.mjs

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

package/dist/server/index.js

@@ -177,6 +177,26 @@ const first = (values, fallback = "") => {
   }
   return { value: fallback, source: null };
 };
+const MODES = /* @__PURE__ */ new Set(["auto", "crm", "forms"]);
+function asSubmissionMode(value) {
+  return typeof value === "string" && MODES.has(value) ? value : void 0;
+}
+function asBool(value) {
+  return typeof value === "boolean" ? value : void 0;
+}
+function formsCfg(strapi) {
+  return strapi.plugin("hubspot").config("forms", {}) ?? {};
+}
+function policyFrom(stored, forms) {
+  return {
+    submissionMode: asSubmissionMode(stored.submissionMode) ?? asSubmissionMode(forms.submissionMode) ?? "auto",
+    writeExtraProperties: asBool(stored.writeExtraProperties) ?? asBool(forms.writeExtraProperties) ?? true,
+    syncFieldsOnPublish: asBool(stored.syncFieldsOnPublish) ?? asBool(forms.syncFieldsOnPublish) ?? false
+  };
+}
+async function resolvePolicy(strapi) {
+  return policyFrom(await getStoredSettings(strapi), formsCfg(strapi));
+}
 async function resolveApiKey(strapi) {
   const stored = await getStoredSettings(strapi);
   if (stored.apiKey) return { apiKey: stored.apiKey, source: "settings" };
@@ -196,7 +216,7 @@ async function resolveAccount(strapi) {
 }
 async function resolveAccountSources(strapi) {
   const stored = await getStoredSettings(strapi);
-  const formsCfg = strapi.plugin("hubspot").config("forms", {}) ?? {};
+  const forms = formsCfg(strapi);
   const portal = first([
     { value: stored.portalId, source: "settings" },
     { value: strapi.plugin("hubspot").config("portalId", ""), source: "config" },
@@ -212,10 +232,11 @@ async function resolveAccountSources(strapi) {
   );
   const form = first([
     { value: stored.defaultFormId, source: "settings" },
-    { value: formsCfg.defaultFormId, source: "config" },
+    { value: forms.defaultFormId, source: "config" },
     { value: process.env[ENV_DEFAULT_FORM], source: "env" }
   ]);
   const { apiKey, source: keySource } = await resolveApiKey(strapi);
+  const policy = policyFrom(stored, forms);
   return {
     configured: Boolean(apiKey),
     keySource,
@@ -225,7 +246,8 @@ async function resolveAccountSources(strapi) {
     defaultFormId: form.value,
     portalSource: portal.source,
     regionSource: region.source,
-    formSource: form.source
+    formSource: form.source,
+    ...policy
   };
 }
 async function publicSettings(strapi) {
@@ -243,6 +265,16 @@ async function patchStoredSettings(strapi, body) {
     next.region = region || "eu1";
   }
   if ("defaultFormId" in body) next.defaultFormId = String(body.defaultFormId ?? "").trim();
+  if ("submissionMode" in body) {
+    const mode = asSubmissionMode(body.submissionMode);
+    if (mode) next.submissionMode = mode;
+  }
+  if ("writeExtraProperties" in body && typeof body.writeExtraProperties === "boolean") {
+    next.writeExtraProperties = body.writeExtraProperties;
+  }
+  if ("syncFieldsOnPublish" in body && typeof body.syncFieldsOnPublish === "boolean") {
+    next.syncFieldsOnPublish = body.syncFieldsOnPublish;
+  }
   await setStoredSettings(strapi, next);
 }
 async function clearStoredApiKey(strapi) {
@@ -1524,6 +1556,96 @@ function resolveSubmission(definition, rawValues) {
   const unknown = Object.keys(rawValues).filter((key) => !declared.has(key));
   return { values, hidden, missingRequired, unknown };
 }
+const OBJECT_TYPE_ID = {
+  contact: "0-1",
+  company: "0-2"
+};
+function leftoverContactProps(contact, sentFieldNames) {
+  const sent = new Set(sentFieldNames);
+  const extra = {};
+  for (const [key, value] of Object.entries(contact)) {
+    if (key === "email" || sent.has(key) || value === "") continue;
+    extra[key] = value;
+  }
+  return extra;
+}
+function mappedContactFields(definition) {
+  const out = [];
+  for (const step of definition.steps ?? []) {
+    for (const fld of step.fields ?? []) {
+      if (fld.type === "company") continue;
+      const mapping = fld.hubspot ?? {};
+      const object = mapping.object?.trim() || "contact";
+      if (object !== "contact") continue;
+      const property = mapping.property?.trim() || fld.name;
+      if (!property) continue;
+      out.push({
+        name: fld.name,
+        label: typeof fld.label === "string" ? fld.label : void 0,
+        type: fld.type,
+        required: Boolean(fld.required),
+        object,
+        property,
+        options: fld.options
+      });
+    }
+  }
+  return out;
+}
+function missingMappedFields(definition, existingNames) {
+  const existing = new Set(existingNames);
+  return mappedContactFields(definition).filter((field) => !existing.has(field.property));
+}
+function hsFieldType(type, options) {
+  switch (type) {
+    case "email":
+      return "email";
+    case "tel":
+      return "phone";
+    case "textarea":
+      return "multi_line_text";
+    case "number":
+      return "number";
+    case "select":
+      return "dropdown";
+    case "radio":
+      return "radio";
+    case "checkbox":
+      return Array.isArray(options) && options.length ? "multiple_checkboxes" : "booleancheckbox";
+    default:
+      return "single_line_text";
+  }
+}
+function toHsFormField(field) {
+  const options = (field.options ?? []).filter((option) => option.value).map((option) => ({
+    value: String(option.value),
+    label: option.label || String(option.value)
+  }));
+  return {
+    objectTypeId: OBJECT_TYPE_ID[field.object || "contact"] || "0-1",
+    name: field.property,
+    label: field.label || field.property,
+    required: Boolean(field.required),
+    hidden: false,
+    fieldType: hsFieldType(field.type, field.options),
+    ...options.length ? { options } : {}
+  };
+}
+function appendFieldGroups(existing, extra) {
+  return [
+    ...existing.map((group) => ({
+      groupType: group.groupType || "default_group",
+      richTextType: group.richTextType || "text",
+      ...group.richText ? { richText: group.richText } : {},
+      fields: group.fields ?? []
+    })),
+    ...extra.map((field) => ({
+      groupType: "default_group",
+      richTextType: "text",
+      fields: [toHsFormField(field)]
+    }))
+  ];
+}
 const HS_BASE$2 = "https://api.hubapi.com";
 const OBJECT_BY_TYPE_ID = {
   "0-1": "contact",
@@ -1687,6 +1809,23 @@ async function listHubspotForms(apiKey) {
 async function fetchHubspotForm(apiKey, formId) {
   return hsGet(apiKey, `/marketing/v3/forms/${encodeURIComponent(formId)}`);
 }
+async function patchHubspotForm(apiKey, formId, body) {
+  const res = await fetch(`${HS_BASE$2}/marketing/v3/forms/${encodeURIComponent(formId)}`, {
+    method: "PATCH",
+    headers: {
+      Authorization: `Bearer ${apiKey}`,
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify(body)
+  });
+  if (!res.ok) {
+    const payload = await res.json().catch(() => ({}));
+    throw Object.assign(new Error(payload.message || `HubSpot ${res.status}`), {
+      status: res.status
+    });
+  }
+  return await res.json();
+}
 const GUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 const PORTAL = /^\d{1,12}$/;
 const HUTK = /^[a-f0-9]{8,128}$/i;
@@ -1735,6 +1874,10 @@ function formFieldNames(raw) {
   return names;
 }
 const shapeCache = /* @__PURE__ */ new Map();
+function clearFormShapeCache(formGuid) {
+  if (formGuid) shapeCache.delete(formGuid);
+  else shapeCache.clear();
+}
 async function loadFormShape(apiKey, formGuid) {
   const cached = shapeCache.get(formGuid);
   if (cached && Date.now() - cached.at < SHAPE_TTL_MS) {
@@ -1830,6 +1973,16 @@ async function submitMarketingForm(input) {
   }
   return result;
 }
+async function syncFieldsToHubspotForm(apiKey, formGuid, definition) {
+  const raw = await fetchHubspotForm(apiKey, formGuid);
+  const extra = missingMappedFields(definition, formFieldNames(raw));
+  if (!extra.length) return [];
+  await patchHubspotForm(apiKey, formGuid, {
+    fieldGroups: appendFieldGroups(raw.fieldGroups ?? [], extra)
+  });
+  clearFormShapeCache(formGuid);
+  return extra.map((field) => field.property);
+}
 function publicForm(entry) {
   return {
     slug: entry.slug,
@@ -2197,6 +2350,7 @@ function createFormsService(strapi, _opts = {}) {
       }
     }
     let usedFormsApi = false;
+    let sentFieldNames = [];
     if (email && apiKey) {
       const groups = groupByObject(form.definition, resolution.values);
       for (const [object, props] of Object.entries(companyGroups)) {
@@ -2204,21 +2358,25 @@ function createFormsService(strapi, _opts = {}) {
       }
       const partition = await partitionBySchema(apiKey, groups);
       rejected = partition.rejected;
+      const contactProps = stringProps(partition.accepted.contact ?? {});
       const account = await resolveAccount(strapi);
+      const policy = await resolvePolicy(strapi);
       const portalId = sanitizePortalId(account.portalId);
       const region = account.region || "eu1";
       const ownGuid = typeof form.hubspotFormId === "string" ? form.hubspotFormId.trim() : "";
       const formGuid = isFormGuid(ownGuid) ? ownGuid : isFormGuid(account.defaultFormId) ? account.defaultFormId.trim() : "";
-      if (portalId && formGuid) {
+      const tryFormsApi = policy.submissionMode !== "crm" && Boolean(portalId && formGuid);
+      if (tryFormsApi && portalId && formGuid) {
         try {
           const shape = await loadFormShape(apiKey, formGuid);
           const fields = filterToFormFields(
-            toHsFields({ ...stringProps(partition.accepted.contact ?? {}), email }),
+            toHsFields({ ...contactProps, email }),
             shape?.names ?? null
           );
           if (fields.length && !fields.some((f) => f.name === "email")) {
             fields.unshift({ name: "email", value: email });
           }
+          sentFieldNames = fields.map((f) => f.name);
           const submitted = await submitMarketingForm({
             apiKey,
             portalId,
@@ -2255,12 +2413,28 @@ function createFormsService(strapi, _opts = {}) {
         const result = await strapi.plugin("hubspot").service("submit").upsert({
           object: "contact",
           idProperty: "email",
-          properties: { ...partition.accepted.contact ?? {}, email }
+          properties: { ...contactProps, email }
         });
         if (result.ok) {
           hubspotSynced = true;
           contactId = result.id;
         }
+      } else if (policy.writeExtraProperties) {
+        const extra = leftoverContactProps(contactProps, sentFieldNames);
+        if (Object.keys(extra).length) {
+          try {
+            const result = await strapi.plugin("hubspot").service("submit").upsert({
+              object: "contact",
+              idProperty: "email",
+              properties: { ...extra, email }
+            });
+            if (result.ok) contactId = result.id ?? contactId;
+          } catch (err) {
+            strapi.log.warn(
+              `[hubspot] leftover contact properties failed (conversion OK) — ${err.message}`
+            );
+          }
+        }
       }
       const domain = corporateDomain(email);
       const companyProps = partition.accepted.company ?? {};
@@ -2559,7 +2733,32 @@ function createFormsAdminController(strapi) {
         documentId: ctx.params.documentId,
         locale: ctx.query.locale
       });
-      ctx.body = { ok: true };
+      const policy = await resolvePolicy(strapi);
+      let addedFields = [];
+      let syncWarning;
+      if (policy.syncFieldsOnPublish) {
+        const { apiKey } = await resolveApiKey(strapi);
+        const account = await resolveAccount(strapi);
+        const ownGuid = typeof entry.hubspotFormId === "string" ? entry.hubspotFormId.trim() : "";
+        const formGuid = isFormGuid(ownGuid) ? ownGuid : isFormGuid(account.defaultFormId) ? account.defaultFormId.trim() : "";
+        if (apiKey && formGuid) {
+          try {
+            addedFields = await syncFieldsToHubspotForm(
+              apiKey,
+              formGuid,
+              entry.definition ?? EMPTY_DEFINITION
+            );
+          } catch (err) {
+            syncWarning = err.message;
+            strapi.log.warn(`[hubspot] field sync on publish failed — ${syncWarning}`);
+          }
+        }
+      }
+      ctx.body = {
+        ok: true,
+        ...addedFields.length ? { addedFields } : {},
+        ...syncWarning ? { syncWarning } : {}
+      };
     },
     async unpublish(ctx) {
       await documents().unpublish({
@@ -3023,10 +3222,20 @@ const config = {
     //    submissions go through the marketing Forms API);
     //  - defaultFormId: portal-wide marketing form GUID when a builder form
     //    doesn't set its own — swap with the portal at production cutover.
+    //  - submissionMode / writeExtraProperties / syncFieldsOnPublish: see
+    //    Settings → HubSpot; each install picks its HubSpot will.
     forms: {
       companyFromDomain: true,
       timelineNote: true,
       defaultFormId: "",
+      // How submissions reach HubSpot. `auto` = Forms API when a GUID is set,
+      // else CRM upsert. `crm` skips conversions. `forms` prefers the Forms API.
+      submissionMode: "auto",
+      // After a conversion, CRM-write mapped contact props the HubSpot form dropped.
+      writeExtraProperties: true,
+      // On publish, PATCH missing mapped contact fields onto the HubSpot form.
+      // Off by default: HubSpot-first installs must not have Strapi mutate forms.
+      syncFieldsOnPublish: false,
       // Per-IP brakes on the public routes; 0 disables one.
       rateLimit: { submitPerMinute: 6, searchPerMinute: 30 }
     }