@elitedcs/ghl-mcp 3.46.0 → 3.47.0

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## 3.47.0 — Blueprint Cap-0: cross-workflow exit chaining + native trigger builders
+
+Two foundational executor fixes so `apply_build_plan` builds workflows that actually
+chain together AND actually fire — the prerequisites for a non-hollow account build.
+
+- **Fixed: a cross-workflow `remove_from_workflow` / `add_to_workflow` halted the build.**
+  When one workflow's exit action targeted another workflow in the SAME plan, execute
+  halted, reporting the (already-built) target as unresolved — so the canonical "pull the
+  lead out of nurture when they book / reply" pattern (workflows that enrol each other)
+  could not fully execute. The executor now resolves EVERY workflow's identity in a first
+  pass (never-clobber bind existing, else create an empty DRAFT) before expanding any
+  actions, so forward, backward, AND mutual cross-workflow references all resolve. Safety
+  rails intact and hardened: never-clobber (existing workflows are never modified),
+  empty-orphan detection (now halts rather than blind-binds when an existing workflow's
+  action count is unreadable), verify-after, and rollback of every unsaved shell on a halt
+  — with any orphan id that could not be deleted SURFACED in the halt message (never
+  swallowed) and dropped from the returned id map.
+- **New: native trigger builders for the trigger types real accounts actually use.**
+  Previously only `contact_tag` triggers were auto-built; every other workflow shipped
+  trigger-less (inactive) — the #1 reason builds were hollow. Blueprint now builds
+  `form_submission`, `appointment` (status-conditioned, e.g. confirmed / no-show),
+  `customer_reply`, `pipeline_stage_updated`, `inbound_webhook`, and `payment_received`
+  triggers natively. Each saved shape was CAPTURED from a real, live, UI-built trigger in a
+  reference account (not guessed) so the synthesized trigger reads back identical and fires.
+  Refs in trigger conditions (form / pipeline / stage) resolve to real GHL ids at build
+  time. A trigger type Blueprint doesn't yet build natively — or one missing the field it
+  needs (e.g. an `appointment` trigger with no status) — is still surfaced as a manual step.
+- Plan validation now rejects two workflows that share a name (the executor binds workflows
+  by name, so duplicates would collapse onto one shell).
+
 ## 3.46.0 — `verify_funnel`: prove a funnel actually captures leads (+ external-funnel wiring bundle)
 
 The live-runtime companion to `audit_workflows`. `audit_workflows` finds dead workflow

package/dist/index.js

@@ -31,7 +31,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@elitedcs/ghl-mcp",
-      version: "3.46.0",
+      version: "3.47.0",
       mcpName: "io.github.drjerryrelth/ghl-command",
       description: "GoHighLevel MCP Server for Claude. 220 tools \u2014 full CRM, automation, marketing control, account-wide workflow audit, live funnel-capture verification, and the only programmatic GHL workflow builder, now multi-tenant across client accounts.",
       main: "dist/index.js",
@@ -11161,13 +11161,16 @@ var actionSchema = import_zod53.z.discriminatedUnion("type", [
     action: import_zod53.z.enum(["exit", "continue", "wait"]).optional()
   })
 ]);
+var APPOINTMENT_STATUSES = ["new", "confirmed", "showed", "noshow", "cancelled", "invalid"];
 var triggerSchema = import_zod53.z.object({
   type: import_zod53.z.string(),
   formRef: nsRef("form").optional(),
   tagRef: nsRef("tag").optional(),
   calendarRef: nsRef("calendar").optional(),
   pipelineRef: nsRef("pipeline").optional(),
-  stageRef: nsRef("stage").optional()
+  stageRef: nsRef("stage").optional(),
+  // Required for a native `appointment` trigger (the status it fires on).
+  appointmentStatus: import_zod53.z.enum(APPOINTMENT_STATUSES).optional()
 });
 var workflowSchema = import_zod53.z.object({
   ref: nsRef("workflow"),
@@ -11376,7 +11379,12 @@ function validateBuildPlan(input) {
     ["customValues", (plan.customValues ?? []).map((x) => ({ ref: x.ref, name: x.name }))],
     ["calendars", (plan.calendars ?? []).map((x) => ({ ref: x.ref, name: x.name }))],
     ["forms", (plan.forms ?? []).map((x) => ({ ref: x.ref, name: x.name }))],
-    ["funnels", (plan.funnels ?? []).map((x) => ({ ref: x.ref, name: x.name }))]
+    ["funnels", (plan.funnels ?? []).map((x) => ({ ref: x.ref, name: x.name }))],
+    // Workflows bind by name too: the executor's two-pass build resolves each
+    // workflow's identity by name (bind same-named existing, else create a shell).
+    // Two plan workflows sharing a name would make the second bind to the FIRST's
+    // freshly-created shell — only one would ever be saved. Reject before any write.
+    ["workflows", (plan.workflows ?? []).map((x) => ({ ref: x.ref, name: x.name }))]
   ];
   for (const [type, objs] of nameGroups) {
     const seen = /* @__PURE__ */ new Map();
@@ -11760,23 +11768,70 @@ function triggerPlainEnglish(trigger, idx) {
       return `trigger type "${trigger.type}"`;
   }
 }
-function expandTrigger(trigger, idx) {
-  if (trigger.type === "contact_tag") {
-    if (!trigger.tagRef) return { kind: "manual", reason: "Set this workflow's contact-tag trigger in the GHL UI (the plan trigger has no tag)." };
-    const tagName = idx.tagName.get(trigger.tagRef) ?? trigger.tagRef;
-    return {
-      kind: "native",
-      trigger: {
+function expandTrigger(trigger, idx, idMap) {
+  const manual = (reason) => ({ kind: "manual", reason });
+  const native = (t, pendingRefs = []) => ({ kind: "native", trigger: t, pendingRefs });
+  switch (trigger.type) {
+    case "contact_tag": {
+      if (!trigger.tagRef) return manual("Set this workflow's contact-tag trigger in the GHL UI (the plan trigger has no tag).");
+      const tagName = idx.tagName.get(trigger.tagRef) ?? trigger.tagRef;
+      return native({
         name: "Contact Tag",
         type: "contact_tag",
         conditions: [{ operator: "index-of-true", field: "tagsAdded", value: tagName, title: "Tag Added", type: "select", id: "tag-added" }]
-      }
-    };
+      });
+    }
+    case "form_submission":
+    case "form_submitted": {
+      if (!trigger.formRef) return manual("Set this workflow's form-submission trigger in the GHL UI (the plan trigger has no form).");
+      const formId = resolveId(trigger.formRef, idMap);
+      return native({
+        name: "Form Submitted",
+        type: "form_submission",
+        conditions: [{ operator: "is-any-of", field: "form.id", value: [formId], title: "Form is", type: "string" }]
+      }, isPending(formId) ? [trigger.formRef] : []);
+    }
+    case "appointment": {
+      const status = trigger.appointmentStatus;
+      if (!status) return manual(`Set this workflow's appointment trigger in the GHL UI: ${triggerPlainEnglish(trigger, idx)} (the plan trigger has no appointmentStatus to fire on, e.g. confirmed / noshow).`);
+      return native({
+        name: `Appointment Status \u2014 ${status}`,
+        type: "appointment",
+        conditions: [
+          { operator: "==", field: "appointment.eventType", value: "normal", title: "Event Type", type: "select" },
+          { operator: "==", field: "appointment.status", value: status, title: "Appointment status is", type: "select" }
+        ]
+      });
+    }
+    case "customer_reply":
+    case "contact_replied": {
+      return native({ name: "Customer Replied", type: "customer_reply", conditions: [] });
+    }
+    case "pipeline_stage_updated": {
+      if (!trigger.pipelineRef || !trigger.stageRef) return manual("Set this workflow's pipeline-stage trigger in the GHL UI (the plan trigger needs both a pipeline and a stage).");
+      const pipelineId = resolveId(trigger.pipelineRef, idMap);
+      const stageId = resolveId(trigger.stageRef, idMap);
+      const pending = [];
+      if (isPending(pipelineId)) pending.push(trigger.pipelineRef);
+      if (isPending(stageId)) pending.push(trigger.stageRef);
+      return native({
+        name: "Pipeline Stage Changed",
+        type: "pipeline_stage_updated",
+        conditions: [
+          { operator: "==", field: "opportunity.pipelineId", value: pipelineId, title: "In pipeline", type: "select" },
+          { operator: "==", field: "opportunity.pipelineStageId", value: stageId, title: "Pipeline stage", type: "select" }
+        ]
+      }, pending);
+    }
+    case "inbound_webhook": {
+      return native({ name: "Inbound Webhook", type: "inbound_webhook", conditions: [] });
+    }
+    case "payment_received": {
+      return native({ name: "Payment Received", type: "payment_received", conditions: [] });
+    }
+    default:
+      return manual(`Set this workflow's trigger in the GHL UI: ${triggerPlainEnglish(trigger, idx)}, then publish. (Blueprint builds the workflow + all its steps as DRAFT; this trigger type isn't auto-built yet.)`);
   }
-  return {
-    kind: "manual",
-    reason: `Set this workflow's trigger in the GHL UI: ${triggerPlainEnglish(trigger, idx)}, then publish. (Blueprint builds the workflow + all its steps as DRAFT; only this trigger type isn't auto-built yet.)`
-  };
 }
 function expandWorkflow(workflow, idx, idMap, gatedBy) {
   const nativeActions = [];
@@ -11798,9 +11853,13 @@ function expandWorkflow(workflow, idx, idMap, gatedBy) {
   let nativeTrigger;
   let triggerManual;
   if (workflow.trigger) {
-    const t = expandTrigger(workflow.trigger, idx);
-    if (t.kind === "native") nativeTrigger = t.trigger;
-    else triggerManual = t.reason;
+    const t = expandTrigger(workflow.trigger, idx, idMap);
+    if (t.kind === "native") {
+      nativeTrigger = t.trigger;
+      t.pendingRefs.forEach((r) => pendingRefs.add(r));
+    } else {
+      triggerManual = t.reason;
+    }
   }
   return {
     ref: workflow.ref,
@@ -12375,35 +12434,56 @@ async function executeBackbone(plan, deps, opts = {}) {
   }
   const wfIndex = buildRefIndex(plan);
   const wfIdMap = new Map(Object.entries(idMap));
-  for (const wf of plan.workflows ?? []) {
+  const planWorkflows = plan.workflows ?? [];
+  const createdSlots = [];
+  const savedWfIds = /* @__PURE__ */ new Set();
+  const rollbackUnsavedShells = async () => {
+    const failedDeletes = [];
+    for (const slot of createdSlots) {
+      if (savedWfIds.has(slot.id)) continue;
+      try {
+        await deps.deleteWorkflow(slot.id);
+      } catch {
+        failedDeletes.push(slot.id);
+      }
+      delete idMap[slot.ref];
+      wfIdMap.delete(slot.ref);
+    }
+    return failedDeletes;
+  };
+  const orphanSuffix = (failed) => failed.length ? ` WARNING: could not delete orphan shell workflow(s) ${failed.join(", ")} \u2014 delete them in GHL before re-running.` : "";
+  const toSave = [];
+  for (const wf of planWorkflows) {
     let workflows;
     try {
       workflows = await deps.listWorkflows();
     } catch (e) {
-      return halt(wf.ref, "workflow", `could not read existing workflows: ${msg(e)}`);
+      const f = await rollbackUnsavedShells();
+      return halt(wf.ref, "workflow", `could not read existing workflows: ${msg(e)}.${orphanSuffix(f)}`);
     }
     const matches = workflows.filter((w) => norm2(w.name) === norm2(wf.name));
     if (matches.length > 1) {
-      return halt(wf.ref, "workflow", `${matches.length} existing workflows are named "${wf.name}" \u2014 ambiguous, cannot safely bind ${wf.ref}. Resolve the duplicate in GHL, then re-run.`);
-    }
-    const expansion = expandWorkflow(wf, wfIndex, wfIdMap, []);
-    if (expansion.pendingRefs.length) {
-      return halt(wf.ref, "workflow", `workflow "${wf.name}" references objects that weren't built/resolved: ${expansion.pendingRefs.join(", ")}. Cannot build it.`);
+      const f = await rollbackUnsavedShells();
+      return halt(wf.ref, "workflow", `${matches.length} existing workflows are named "${wf.name}" \u2014 ambiguous, cannot safely bind ${wf.ref}. Resolve the duplicate in GHL, then re-run.${orphanSuffix(f)}`);
     }
     if (matches.length === 1) {
       const exId = matches[0].id;
-      if (expansion.nativeActions.length > 0) {
-        let existingCount = -1;
+      const planHasActions = expandWorkflow(wf, wfIndex, wfIdMap, []).nativeActions.length > 0;
+      if (planHasActions) {
+        let existingCount;
         try {
           existingCount = await deps.getWorkflowActionCount(exId);
-        } catch {
-          existingCount = -1;
+        } catch (e) {
+          const f = await rollbackUnsavedShells();
+          return halt(wf.ref, "workflow", `could not read the existing workflow named "${wf.name}" to tell whether it's an empty orphan (${msg(e)}) \u2014 refusing to bind it blindly (Blueprint never modifies an existing workflow, and binding an orphan would ship a stepless workflow). Re-run.${orphanSuffix(f)}`);
         }
         if (existingCount === 0) {
-          return halt(wf.ref, "workflow", `a workflow named "${wf.name}" already exists but has NO actions \u2014 likely an empty orphan from a failed prior run (or a name collision). Delete it in GHL, then re-run. (Blueprint never modifies an existing workflow.)`);
+          const f = await rollbackUnsavedShells();
+          return halt(wf.ref, "workflow", `a workflow named "${wf.name}" already exists but has NO actions \u2014 likely an empty orphan from a failed prior run (or a name collision). Delete it in GHL, then re-run. (Blueprint never modifies an existing workflow.)${orphanSuffix(f)}`);
         }
       }
       idMap[wf.ref] = exId;
+      wfIdMap.set(wf.ref, exId);
       built.push({ ref: wf.ref, type: "workflow", name: wf.name, status: "existing", realId: exId });
       continue;
     }
@@ -12411,9 +12491,24 @@ async function executeBackbone(plan, deps, opts = {}) {
     try {
       wfId = await deps.createWorkflow(wf.name);
     } catch (e) {
-      return halt(wf.ref, "workflow", `create failed: ${msg(e)}`);
+      const f = await rollbackUnsavedShells();
+      return halt(wf.ref, "workflow", `create failed: ${msg(e)}.${orphanSuffix(f)}`);
+    }
+    if (!wfId) {
+      const f = await rollbackUnsavedShells();
+      return halt(wf.ref, "workflow", `workflow create returned no id.${orphanSuffix(f)}`);
+    }
+    createdSlots.push({ ref: wf.ref, id: wfId });
+    idMap[wf.ref] = wfId;
+    wfIdMap.set(wf.ref, wfId);
+    toSave.push({ wf, id: wfId });
+  }
+  for (const { wf, id: wfId } of toSave) {
+    const expansion = expandWorkflow(wf, wfIndex, wfIdMap, []);
+    if (expansion.pendingRefs.length) {
+      const f = await rollbackUnsavedShells();
+      return halt(wf.ref, "workflow", `workflow "${wf.name}" references objects that weren't built/resolved: ${expansion.pendingRefs.join(", ")}. Cannot build it.${orphanSuffix(f)}`);
     }
-    if (!wfId) return halt(wf.ref, "workflow", "workflow create returned no id");
     const triggers = expansion.nativeTrigger ? [expansion.nativeTrigger] : [];
     try {
       await deps.saveWorkflow(wfId, { actions: expansion.nativeActions, triggers, stopOnResponse: wf.stopOnResponse });
@@ -12422,19 +12517,10 @@ async function executeBackbone(plan, deps, opts = {}) {
         if (count === 0) throw new Error("saved but no actions persisted (read-after-write)");
       }
     } catch (e) {
-      let rolledBack = false;
-      try {
-        await deps.deleteWorkflow(wfId);
-        rolledBack = true;
-      } catch {
-      }
-      return halt(
-        wf.ref,
-        "workflow",
-        rolledBack ? `actions/trigger save failed; the partial workflow was rolled back (deleted): ${msg(e)}` : `actions/trigger save failed AND the rollback delete also failed \u2014 manually delete the orphan workflow (id ${wfId}) in GHL before re-running: ${msg(e)}`
-      );
+      const f = await rollbackUnsavedShells();
+      return halt(wf.ref, "workflow", `actions/trigger save failed; the partial workflow${createdSlots.length > 1 ? " (and any other unsaved shells)" : ""} was rolled back: ${msg(e)}.${orphanSuffix(f)}`);
     }
-    idMap[wf.ref] = wfId;
+    savedWfIds.add(wfId);
     built.push({ ref: wf.ref, type: "workflow", name: wf.name, status: "created", realId: wfId });
     if (expansion.triggerManual) manual.push({ ref: wf.ref, type: "workflow-trigger", name: wf.name, reason: `[${wf.name}] ${expansion.triggerManual}` });
     for (const nc of expansion.needsContent) manual.push({ ref: wf.ref, type: "workflow-action", name: wf.name, reason: `[${wf.name}] ${nc.reason}` });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elitedcs/ghl-mcp",
-  "version": "3.46.0",
+  "version": "3.47.0",
   "mcpName": "io.github.drjerryrelth/ghl-command",
   "description": "GoHighLevel MCP Server for Claude. 220 tools — full CRM, automation, marketing control, account-wide workflow audit, live funnel-capture verification, and the only programmatic GHL workflow builder, now multi-tenant across client accounts.",
   "main": "dist/index.js",