@elitedcs/ghl-mcp 3.90.0 → 3.90.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 3.90.1: Add them for me and Confirm and build add exactly the people you were shown
+
+This release is everything in 3.90.0, plus the fix below. It fixes behavior that shipped in 3.89.0 and 3.90.0.
+
+**Add them for me and Confirm and build now add exactly the people shown, mark anyone getting an admin login, and refuse if the team changed.** Step 7, Staff, lists each person with their job, marks anyone whose login will be an admin with "Admin login", and says where the list came from. Confirm and build names each login it will make, the same way, before anything is made. When you press, the cockpit reads the team again first. If it changed since you looked, nobody is added and the list is shown as it is now.
+
+**One team, the same everywhere.** The team is Your team in step 5 when it has anyone on it, otherwise the client's intake. Your own intake draft counts only when the client has not submitted the intake. In 3.89.0 and 3.90.0 an older draft could add someone who had left, with an admin login, and Build could make logins from the intake while step 7 checked Your team.
+
+**Someone already in the account keeps their login as it is.** If the list would give them a different level, step 7 says so, and you change it in GoHighLevel.
+
+**After Add them for me, step 7 says what happened:** who was added, who already had a login, and anyone who got a login but is no longer on the team, so you can remove it in GoHighLevel.
+
+**A new login is never made twice while GoHighLevel catches up.** GoHighLevel can take a minute to list a login it has just made. Until it does, step 7 and the board say the person "is still being set up in GoHighLevel", and Add them for me does not send them again, from any page or window, for up to 10 minutes. If GoHighLevel insisted on a password, step 7 now shows the one-time password, as the board does.
+
+**Known limits, fixed in the next release.** The board's staff panel does not show when someone's login level differs from the list. If someone is taken off the team while their login is being made and the connection drops, step 7 can still say they could not be added. Without an agency key, step 7 says your plan does not let you add people. The staff step says Intake waits for it (only Build does), and says calendars and lead alerts will use the people found, which it does not check. Blueprint Review says staff are not in the account when it could not read them. When nobody's job says owner, Build makes the first person listed an admin, while Add them for me makes them a user; Build's confirmation shows it before anything is made.
+
+After Add them for me or Confirm and build, check the client's GoHighLevel Users list.
+
 ## 3.90.0: the cockpit never acts on the wrong client, and refuses a change made from an old page
 
 This release is everything in 3.89.0, plus the changes below.

package/README.md

@@ -899,7 +899,7 @@ Built by **[Elite DCs, LLC](https://elitedcs.com)** — a digital marketing and
 
 **Tech stack:** TypeScript, Node.js, esbuild, MCP SDK, Zod, GHL API v2, Firebase Auth
 
-**Version:** 3.90.0
+**Version:** 3.90.1
 
 ---
 

package/dist/index.js

@@ -8255,10 +8255,16 @@ function pickUsers(raw) {
     const last = typeof o.lastName === "string" ? o.lastName : "";
     const name = typeof o.name === "string" && o.name ? o.name : `${first2} ${last}`.trim();
     const email = typeof o.email === "string" ? o.email : void 0;
-    out.push({ id, name: name || id, email });
+    const roles = o.roles && typeof o.roles === "object" ? o.roles : void 0;
+    const role = roles && typeof roles.role === "string" ? roles.role : void 0;
+    out.push({ id, name: name || id, email, ...role ? { role } : {} });
   }
   return out;
 }
+function isDefinitiveRefusal(error) {
+  const m = /^GHL API Error (\d{3})\b/.exec(error);
+  return Boolean(m && m[1].startsWith("4") && m[1] !== "408");
+}
 function classifyCreateUserError(error) {
   return error.toLowerCase().includes(FEATURE_UNAVAILABLE_TEXT) ? "feature_unavailable" : "other";
 }
@@ -8301,6 +8307,7 @@ async function createOrBindUserWith(args, deps) {
       lastError = msg(e);
       if (inBuildRequestScope() && isRetryableAccountError(e)) break;
       if (classifyCreateUserError(lastError) === "feature_unavailable") break;
+      if (!isDefinitiveRefusal(lastError)) break;
       if (/password/i.test(lastError) && !password) {
         password = generateTemporaryPassword();
         generatedPassword = password;
@@ -36471,7 +36478,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@elitedcs/ghl-mcp",
-      version: "3.90.0",
+      version: "3.90.1",
       mcpName: "io.github.drjerryrelth/ghl-command",
       description: "GoHighLevel MCP Server for Claude. 250 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",
@@ -44293,6 +44300,64 @@ var init_normalizer = __esm({
 });
 
 // src/staff-first.ts
+function staffWaitingLine(name) {
+  return `${name} is still being set up in GoHighLevel. Add them for me will not add them again for up to 10 minutes.`;
+}
+function createMadeNothing(outcome) {
+  if (outcome.ok) return false;
+  if (outcome.stage === "verify") return false;
+  if (outcome.stage !== "create") return true;
+  return isDefinitiveRefusal(outcome.error ?? "");
+}
+function pendingSeen(pending, check) {
+  if (check.status === "unreadable") return { ...pending ?? {} };
+  const listed = new Set(check.matched.map((m) => normEmail(m.email)));
+  return Object.fromEntries(Object.entries(pending ?? {}).filter(([email]) => !listed.has(normEmail(email))));
+}
+function settleResults(results, check) {
+  const unreadable = check.status === "unreadable";
+  const listed = new Set(check.matched.map((m) => normEmail(m.email)));
+  const onTeam = new Set(check.listed.map((m) => normEmail(m.email)));
+  for (const r of results) {
+    const e = normEmail(r.email);
+    if (!unreadable && !onTeam.has(e)) continue;
+    if (unreadable && r.status === "existing") continue;
+    if (!unreadable && listed.has(e)) {
+      r.ok = true;
+      if (r.status !== "existing") r.status = "created";
+      r.said = r.status === "existing" ? `${r.name} already had a login. Nothing was created.` : `${r.name} was added. GoHighLevel should email them an invitation.`;
+    } else if (r.refused) {
+      r.ok = false;
+      delete r.status;
+      r.said = r.refusedSaid ?? r.said;
+    } else {
+      r.ok = false;
+      r.said = staffWaitingLine(r.name);
+    }
+  }
+  return results;
+}
+function livePending(pending, nowMs) {
+  const out = {};
+  for (const [email, v] of Object.entries(pending ?? {})) {
+    const at = Date.parse(v.at);
+    if (Number.isFinite(at) && nowMs - at >= 0 && nowMs - at < STAFF_PENDING_MS) out[normEmail(email)] = v;
+  }
+  return out;
+}
+function applyStaffPending(check, pending, nowMs) {
+  const held = livePending(pending, nowMs);
+  const waiting = check.missing.filter((m) => held[normEmail(m.email)]);
+  if (!waiting.length) return check;
+  const isHeld = (email) => Boolean(held[normEmail(email)]);
+  const lines = new Map(waiting.map((m) => [normEmail(m.email), staffWaitingLine(m.name)]));
+  return {
+    ...check,
+    creations: (check.creations ?? []).filter((c) => !isHeld(c.email)),
+    steps: check.missing.map((m, i) => lines.get(normEmail(m.email)) ?? check.steps[i]).filter((x) => typeof x === "string"),
+    waiting: waiting.map((m) => ({ name: m.name, email: m.email, line: lines.get(normEmail(m.email)) }))
+  };
+}
 function personLabel(p) {
   return `${p.name} (${p.email})`;
 }
@@ -44332,22 +44397,11 @@ function intakeAnswer(answers, key2, label2) {
   if (Array.isArray(v)) return v.map(String).join("\n");
   return void 0;
 }
-function prefillTeamAnswers(answers, roster, questions) {
-  const out = { ...answers };
-  if (!roster) return out;
-  const pairs = [
-    [STAFF_INTAKE_KEYS.staff, roster.lines],
-    [STAFF_INTAKE_KEYS.notify, roster.notifyName],
-    [STAFF_INTAKE_KEYS.calls, roster.callsName]
-  ];
-  for (const [key2, value] of pairs) {
-    const label2 = questions.find((q3) => q3.key === key2)?.label;
-    if (label2 && value && value.trim() && !String(out[label2] ?? "").trim()) out[label2] = value;
-  }
-  return out;
+function teamBoxDecides(roster) {
+  return Boolean(roster && String(roster.lines ?? "").trim());
 }
 function teamAnswersFromRoster(answers, roster, questions) {
-  if (!roster || !String(roster.lines ?? "").trim()) return { ...answers };
+  if (!roster || !teamBoxDecides(roster)) return { ...answers };
   const out = { ...answers };
   for (const [key2, value] of [[STAFF_INTAKE_KEYS.staff, roster.lines], [STAFF_INTAKE_KEYS.notify, roster.notifyName], [STAFF_INTAKE_KEYS.calls, roster.callsName]]) {
     const label2 = questions.find((q3) => q3.key === key2)?.label;
@@ -44385,11 +44439,20 @@ function checkStaff(listed, users, opts = { canAddForYou: false }) {
   }
   const matched = [];
   const missing = [];
+  const levelDiffs = [];
   for (const p of listed.people) {
     const u = findUserByEmail(users, p.email);
-    if (u) matched.push({ ...p, userId: u.id });
-    else missing.push(p);
+    if (u) {
+      matched.push({ ...p, userId: u.id });
+      const listedRole = personToCreateInput(p).role;
+      if (u.role && u.role !== listedRole) {
+        const d = { name: p.name, email: p.email, ...p.role ? { job: p.role } : {}, listed: listedRole, account: u.role };
+        levelDiffs.push({ ...d, line: staffLevelDiffLine(d) });
+      }
+    } else missing.push(p);
   }
+  if (levelDiffs.length) Object.assign(base, { levelDiffs });
+  Object.assign(base, { creations: creationsFor(missing) });
   if (missing.length === 0) {
     return {
       ...base,
@@ -44451,17 +44514,23 @@ function personToCreateInput(p) {
     ...p.mobile ? { phone: p.mobile } : {}
   };
 }
-async function addMissingStaff(deps, listed, now) {
-  const before = await readStaffCheck(deps, listed, now);
+async function addMissingStaff(deps, listed, now, compared) {
+  const before = compared ?? await readStaffCheck(deps, listed, now);
   if (before.status !== "needs_staff") return { results: [], check: before };
   if (!deps.canCreateUsers()) {
     return { results: [], check: before };
   }
   const results = [];
   let refused = false;
+  const waiting = new Set((before.waiting ?? []).map((w) => normEmail(w.email)));
   for (const p of before.missing) {
+    if (waiting.has(normEmail(p.email))) {
+      results.push({ name: p.name, email: p.email, ok: false, said: staffWaitingLine(p.name) });
+      continue;
+    }
     if (refused) {
-      results.push({ name: p.name, email: p.email, ok: false, said: `${p.name} has to be added in GoHighLevel itself, for the same reason.` });
+      const said = `${p.name} has to be added in GoHighLevel itself, for the same reason.`;
+      results.push({ name: p.name, email: p.email, ok: false, refused: true, refusedSaid: said, said });
       continue;
     }
     let outcome;
@@ -44475,36 +44544,86 @@ async function addMissingStaff(deps, listed, now) {
         name: p.name,
         email: p.email,
         ok: true,
-        said: outcome.status === "existing" ? `${p.name} already had a login. Nothing was created.` : `${p.name} was added. GoHighLevel sends them an invitation email.`,
+        status: outcome.status,
+        said: outcome.status === "existing" ? `${p.name} already had a login. Nothing was created.` : `${p.name} was added. GoHighLevel should email them an invitation.`,
         ...outcome.generatedPassword ? { generatedPassword: outcome.generatedPassword } : {}
       });
     } else {
       if (outcome.errorKind === "feature_unavailable") refused = true;
+      const said = outcome.errorKind === "feature_unavailable" ? `GoHighLevel does not let this agency add people from outside GoHighLevel, so ${p.name} has to be added in GoHighLevel itself.` : `${p.name} could not be added. GoHighLevel said: ${outcome.error}`;
       results.push({
         name: p.name,
         email: p.email,
         ok: false,
-        said: outcome.errorKind === "feature_unavailable" ? `GoHighLevel does not let this agency add people from outside GoHighLevel, so ${p.name} has to be added in GoHighLevel itself.` : `${p.name} could not be added. GoHighLevel said: ${outcome.error}`
+        ...createMadeNothing(outcome) ? { refused: true, refusedSaid: said } : {},
+        said
       });
     }
   }
   const after = await readStaffCheck(refused ? { listUsers: () => deps.listUsers(), canCreateUsers: () => false } : deps, listed, now);
   if (refused) after.createRefused = true;
-  for (const r of results) {
-    if (r.ok && after.missing.some((m) => normEmail(m.email) === normEmail(r.email))) {
-      r.ok = false;
-      r.said = `${r.name} was sent to GoHighLevel but is not on this account's staff list yet. Wait a minute, then click Check again.`;
-    }
+  return { results: settleResults(results, after), check: after };
+}
+function effectiveStaffList(roster, intake, draftText) {
+  if (roster && teamBoxDecides(roster)) return { ...listedStaff(roster), source: "team" };
+  if (intake?.submitted) return { ...listedStaff(void 0, intake.text), source: "intake" };
+  if (draftText && draftText.trim()) return { ...listedStaff(void 0, draftText), source: "draft" };
+  return { people: [], skipped: [] };
+}
+function creationsFor(people) {
+  return people.map((p) => {
+    const c = personToCreateInput(p);
+    return { email: normEmail(c.email), firstName: c.firstName, lastName: c.lastName, role: c.role, ...p.role ? { job: p.role } : {} };
+  });
+}
+function parseShownCreations(raw) {
+  if (!Array.isArray(raw)) return void 0;
+  const out = [];
+  for (const r of raw.slice(0, 500)) {
+    if (!r || typeof r !== "object") continue;
+    const x = r;
+    if (typeof x.email !== "string" || !x.email.trim() || x.role !== "admin" && x.role !== "user") continue;
+    out.push({ email: normEmail(x.email), firstName: typeof x.firstName === "string" ? x.firstName : "", lastName: typeof x.lastName === "string" ? x.lastName : "", role: x.role });
   }
-  return { results, check: after };
+  return out;
+}
+function sameCreations(shown, live) {
+  const key2 = (c) => [normEmail(c.email), fullName(c), c.role].join("|");
+  const a = [...shown].map(key2).sort(), b = [...live].map(key2).sort();
+  return a.length === b.length && a.every((x, i) => x === b[i]);
+}
+function staffLevelDiffLine(d) {
+  return `${d.name} is in this account as ${d.account === "admin" ? "an admin" : "a user"} login. The list${d.job ? ` (${d.job})` : ""} would make ${d.listed === "admin" ? "an admin" : "a user"} login. Nothing is changed here: change it in GoHighLevel if it should be different.`;
+}
+function staffAddSaid(results) {
+  const made = results.filter((r) => r.status === "created" && r.ok).map((r) => r.name);
+  const bound = results.filter((r) => r.status === "existing" && r.ok).map((r) => r.name);
+  const out = [];
+  if (made.length) out.push(`Added: ${listSentence(made)}.`);
+  if (bound.length) out.push(`${listSentence(bound)} already had a login.`);
+  for (const r of results) if (!r.ok) out.push(r.said);
+  return out;
+}
+function staffNotOnTeamLine(name) {
+  return `${name} got a login but is not on the team now: remove it in GoHighLevel if it should not be there.`;
+}
+function staffUncheckedLine(results) {
+  const made = results.filter((r) => r.status === "created" && r.ok).map((r) => r.name);
+  return `${made.length ? `Added: ${listSentence(made)}. ` : ""}The team could not be checked again; look at the team list before adding more.`;
+}
+function planTeamMatches(planUsers2, people) {
+  const a = [...new Set((planUsers2 ?? []).map((u) => normEmail(u.email)))].sort();
+  const b = [...new Set(people.map((p) => normEmail(p.email)))].sort();
+  return a.length === b.length && a.every((x, i) => x === b[i]);
 }
-var STAFF_INTAKE_KEYS, STAFF_STEP_ABOUT, STAFF_LIST_HELP, STAFF_HOW_TO_ADD, STAFF_REVIEW_WARNING, STAFF_REVIEW_UNCHECKED, STAFF_GATED_STAGES, ADMIN_ROLE_RE;
+var STAFF_PENDING_MS, STAFF_INTAKE_KEYS, STAFF_STEP_ABOUT, STAFF_LIST_HELP, STAFF_HOW_TO_ADD, STAFF_REVIEW_WARNING, STAFF_REVIEW_UNCHECKED, STAFF_GATED_STAGES, ADMIN_ROLE_RE, fullName, STAFF_ADMIN_MARK, STAFF_SOURCE_WORDS;
 var init_staff_first = __esm({
   "src/staff-first.ts"() {
     "use strict";
     init_normalizer();
     init_user_provisioning();
     init_ghl_click_paths();
+    STAFF_PENDING_MS = 10 * 60 * 1e3;
     STAFF_INTAKE_KEYS = { staff: "staff_members", notify: "notify_name", calls: "calls_name" };
     STAFF_STEP_ABOUT = "Calendars and lead alerts need real people. List everyone who takes appointments and everyone who should hear about new leads. We check this client's account for each email address before anything is built, so no calendar or alert is built with a blank name to fix later.";
     STAFF_LIST_HELP = "One person per line: name, email, role. For example: Jane Smith, jane@yourclinic.com, Front desk. If it is just you, add yourself.";
@@ -44513,6 +44632,13 @@ var init_staff_first = __esm({
     STAFF_REVIEW_UNCHECKED = "We have not checked this client's staff yet. Build will not start until everyone who takes appointments is in the account. Step 7, Staff, checks them.";
     STAFF_GATED_STAGES = /* @__PURE__ */ new Set([3]);
     ADMIN_ROLE_RE = /\b(owner|founder|admin|administrator|ceo|principal|director)\b/i;
+    fullName = (c) => [c.firstName, c.lastName === "-" ? "" : c.lastName].filter(Boolean).join(" ");
+    STAFF_ADMIN_MARK = "Admin login";
+    STAFF_SOURCE_WORDS = {
+      team: "This list is from Your team in step 5.",
+      intake: "This list is from the client's intake.",
+      draft: "This list is from your intake draft: the client's intake has no team on it yet."
+    };
   }
 });
 
@@ -50704,12 +50830,12 @@ var init_build_steps = __esm({
       "Command OS has built and checked the account. You sign off here. The list below says what you can switch on now and what waits until its approval comes through."
     ];
     BUILD_STEPS_SCRIPT = String.raw`
-let bsChange={},bsErr={},bsBusy={},bsStaff={},bsSeen={},bsDraft={},bsNote={},bsInSteps=false,bsMoreOpen={},bsInfo={};
+let bsStaffSaid={},bsChange={},bsErr={},bsBusy={},bsStaff={},bsSeen={},bsDraft={},bsNote={},bsInSteps=false,bsMoreOpen={},bsInfo={};
 /* A link with ?client=<id>&reconnect=1 (or the older #client=<id>&reconnect=1) opens that client's reconnect box (round-6 review). */
 try{for(const hp of [new URLSearchParams(location.search),new URLSearchParams(location.hash.slice(1))])if(hp.get("reconnect")==="1"&&hp.get("client"))bsMoreOpen[hp.get("client")]=true}catch(e){}
 async function bsPost(url,body){let r,j=null;try{r=await fetch(url,{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify(body)})}catch(e){return {ok:false,error:"Command OS did not answer. Check it is still running, then try again."}}
  try{j=await r.json()}catch(e){}
- if(!r.ok||!j||j.ok===false)return {ok:false,error:(j&&j.error)||"That did not go through, and nothing was changed.",missing:j&&j.missing,reason:j&&j.reason};
+ if(!r.ok||!j||j.ok===false)return {ok:false,error:(j&&j.error)||"That did not go through, and nothing was changed.",missing:j&&j.missing,reason:j&&j.reason,check:j&&j.check,said:j&&j.said,results:j&&j.results};
  return j}
 function bsInputs(c,state,run){const id=c.locationId;const st=(((state.clients||{})[id])||{stages:[]}).stages||[];
  const stale=((((state.buildViews||{})[id])||{}).stale||[]).map(x=>x.stage);const acc=((state.accounts||{})[id])||{};
@@ -50870,6 +50996,8 @@ function bsBody(n,c,state,run,box){const id=c.locationId;const key="s"+n+":"+id;
 const BS_KIND={users:"staff member",pipelines:"pipeline",customFields:"custom field",tags:"tag",customValues:"custom value",calendars:"calendar",forms:"form",workflows:"workflow",emails:"email",sms:"text message",emailTemplates:"email template",smsTemplates:"text message template"};
 let bsAllow={};
 function bsPause(c,state,pv,box){const id=c.locationId;const key="confirm:"+id;
+ /* A list from before 3.90.1 names no logins: out of date, made again before anything can be confirmed. */
+ if(!Array.isArray(pv.logins)){box.appendChild(mk("p","cds-callout warn","This list is out of date. Start the build again to see the current one."));bsRun(c,state,lastRun||{},3,"Start the build",box);return}
  /* Ticks belong to one list: a new list starts unticked, and only keys on the list shown are sent (review of a38ebe1). */
  if(!bsAllow[id]||bsAllow[id].fp!==pv.fingerprint)bsAllow[id]={fp:pv.fingerprint,keys:{}};const allow=bsAllow[id].keys;
  box.appendChild(mk("h3","","Before Build writes anything"));
@@ -50877,6 +51005,10 @@ function bsPause(c,state,pv,box){const id=c.locationId;const key="confirm:"+id;
  const kinds=Object.entries(pv.createByType||{}).filter(x=>x[1]>0).map(x=>x[1]+" "+(BS_KIND[x[0]]||x[0])+(x[1]===1?"":"s"));
  box.appendChild(mk("h4","","Will create: "+pv.createCount+" new "+plural(pv.createCount,"item")));
  if(kinds.length)box.appendChild(mk("p","muted",kinds.join(", ")+"."));
+ /* The logins it would make, each named with the job the team list gives and "Admin login" where it is one
+    (3.90.1, Codex on ad610635), before Confirm and build can be pressed. */
+ if((pv.logins||[]).length){const sc=(state.staffChecks||{})[id]||{};const jobOf=e=>{const p=[...(sc.listed||[]),...(sc.matched||[]),...(sc.missing||[])].find(x=>String(x.email).trim().toLowerCase()===String(e).trim().toLowerCase());return p&&p.role?p.role:""};
+  const ul=mk("ul","cds-list bs-logins");for(const u of pv.logins){const li=mk("li","");li.appendChild(mk("span","",u.name+" ("+u.email+")"+(jobOf(u.email)?" · "+jobOf(u.email):"")));if(u.role==="admin")li.appendChild(chip("info",BS_ADMIN_MARK));ul.appendChild(li)}box.appendChild(ul)}
  box.appendChild(mk("h4","","Will use what is already there: "+pv.reuse.length));
  if(pv.reuse.length){const ul=mk("ul","cds-list");for(const e of pv.reuse)ul.appendChild(mk("li",""," "+(BS_KIND[e.type]||e.type)+" \u201c"+e.name+"\u201d, used as it is"));box.appendChild(ul)}
  else box.appendChild(mk("p","muted","Nothing already in the account is used."));
@@ -50985,22 +51117,28 @@ function bsReconnect(c,pr){const id=c.locationId;const key="reconnect:"+id;const
 function bsOpenReconnect(id){bsMoreOpen[id]=true;render(lastState,lastRun);const el=document.getElementById("bs-more-"+id);if(el)try{el.scrollIntoView({block:"start"})}catch(e){}}
 /* Step 7: everyone from step 5 must be a user in the client's GoHighLevel account. */
 function bsStaffStep(c,state,box){const id=c.locationId;const sc=(state.staffChecks||{})[id]||bsStaff[id];const key="staff:"+id;
+ /* What the last Add them for me did (3.90.1): who was added, who already had a login, any login made for someone
+    no longer on the team. Shown in every staff state (Codex on 516081d8); the list below is the team as it is now. */
+ if((bsStaffSaid[id]||[]).length){const said=mk("div","cds-callout info cds-stack bs-staffsaid");said.setAttribute("role","status");for(const line of bsStaffSaid[id])said.appendChild(mk("p","",line));box.appendChild(said)}
  if(!sc&&bsErr[key]&&!bsBusy[key]){bsErrLine(key,box);box.appendChild(bsBtn("Check again",()=>{bsBusy[key]=true;delete bsErr[key];bsCheckStaff(id);render(lastState,lastRun)}));return}
  if(!sc&&!bsBusy[key]){bsBusy[key]=true;bsCheckStaff(id)}
  if(!sc){box.appendChild(mk("p","muted","Checking this client's GoHighLevel account for your team…"));return}
- if(sc.status==="needs_list"){box.appendChild(mk("p","","Nobody is on the team yet. Add them under Your team in step 5, Intake."));const go=bsBtn("Open step 5",()=>{bsChange[id+":4"]=true;render(lastState,lastRun)},true);box.appendChild(go);return}
+ if(sc.status==="needs_list"){box.appendChild(mk("p","","Nobody is on the team yet. Add them under Your team in step 5, Intake."));const go=bsBtn("Open step 5",()=>{bsChange[id+":4"]=true;render(lastState,lastRun)},true);box.appendChild(go);bsErrLine(key,box);return}
  if(sc.status==="unreadable"){box.appendChild(mk("p","cds-callout warn","We could not read this client's staff in GoHighLevel. Try Check again in a minute. If it keeps happening, reconnect this client."));box.appendChild(bsBtn("Reconnect this client",()=>bsOpenReconnect(id),true))}
+ if(sc.source&&BS_STAFF_SOURCE[sc.source])box.appendChild(mk("p","muted bs-source",BS_STAFF_SOURCE[sc.source]));
  const ul=mk("ul","cds-list bs-people");
- for(const m of (sc.matched||[])){const li=mk("li","");li.appendChild(chip("ok","In the account"));li.appendChild(mk("span",""," "+m.name+" · "+m.email));ul.appendChild(li)}
- for(const p of (sc.missing||[])){const li=mk("li","");li.appendChild(chip("warn","Not added yet"));li.appendChild(mk("span",""," "+p.name+" · "+p.email+" "));
+ for(const m of (sc.matched||[])){const li=mk("li","");li.appendChild(chip("ok","In the account"));li.appendChild(mk("span",""," "+m.name+" · "+m.email+(m.role?" · "+m.role:"")));ul.appendChild(li)}
+ for(const p of (sc.missing||[])){const li=mk("li","");const w=(sc.waiting||[]).find(x=>x.email===p.email);if(!w)li.appendChild(chip("warn","Not added yet"));const cr=(sc.creations||[]).find(x=>x.email===String(p.email).trim().toLowerCase());if(cr&&cr.role==="admin")li.appendChild(chip("info",BS_ADMIN_MARK));li.appendChild(mk("span",""," "+p.name+" · "+p.email+(p.role?" · "+p.role:"")+" "));if(w)li.appendChild(mk("span","muted",w.line+" "));
   for(const [lab,val] of [["Copy name",p.name],["Copy email",p.email]]){const cp=mk("button","cds-link",lab);cp.type="button";cp.onclick=async()=>{try{await navigator.clipboard.writeText(val);cp.textContent="Copied"}catch(e){cp.textContent=val}};li.appendChild(cp);li.appendChild(document.createTextNode(" "))}
   ul.appendChild(li)}
  box.appendChild(ul);
+ for(const d of (sc.levelDiffs||[]))box.appendChild(mk("p","cds-callout warn bs-level",d.line));
+
  if((sc.missing||[]).length){
-  if(sc.canAddForYou&&!sc.createRefused){box.appendChild(mk("p","","We can add them to this client's GoHighLevel account for you. Each person gets a login email from GoHighLevel, so let your client know."));
-   box.appendChild(bsBtn(bsBusy[key+":add"]?"Adding…":"Add them for me",async()=>{bsBusy[key+":add"]=true;delete bsErr[key];render(lastState,lastRun);const j=await bsPost("/api/staff/add",{locationId:id});bsBusy[key+":add"]=false;if(!j.ok)bsErr[key]=j.error;else bsStaff[id]=j.check;load(true)}))}
+  if(sc.canAddForYou&&!sc.createRefused){if((sc.creations||[]).length){box.appendChild(mk("p","","We can add them to this client's GoHighLevel account for you. GoHighLevel should email each new person an invitation. Let your client know, and check with them that it arrived."));
+   box.appendChild(bsBtn(bsBusy[key+":add"]?"Adding…":"Add them for me",async()=>{bsBusy[key+":add"]=true;delete bsErr[key];render(lastState,lastRun);const j=await bsPost("/api/staff/add",{locationId:id,shown:sc.creations||[]});bsBusy[key+":add"]=false;bsStaffSaid[id]=[...(j.ok?(j.said||[]):[]),...(j.results||[]).filter(x=>x.generatedPassword).map(x=>x.said+" Their one-time password is "+x.generatedPassword+". Give it to them privately; it is not saved anywhere.")];if(!j.ok){bsErr[key]=j.error;if(j.check)bsStaff[id]=j.check}else bsStaff[id]=j.check;load(true)}))}}
   else{const how=mk("ol","bs-how");for(const t of BS_HOW_TO_ADD)how.appendChild(mk("li","",t));box.appendChild(mk("p","","GoHighLevel only lets you add people in its own screens on your plan. Do this once for each person marked Not added yet:"));box.appendChild(how)}}
- const again=bsBtn(bsBusy[key]?"Checking…":"Check again",()=>{bsBusy[key]=true;bsCheckStaff(id);render(lastState,lastRun)},sc.status==="ready");box.appendChild(again);
+ const again=bsBtn(bsBusy[key]?"Checking…":"Check again",()=>{bsBusy[key]=true;delete bsStaffSaid[id];bsCheckStaff(id);render(lastState,lastRun)},sc.status==="ready");box.appendChild(again);
  bsErrLine(key,box)}
 async function bsCheckStaff(id){const key="staff:"+id;let j=null;try{j=await(await fetch("/api/staff/check",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({locationId:id})})).json()}catch(e){}
  bsBusy[key]=false;if(j&&j.ok){bsStaff[id]=j.check;delete bsErr[key]}else bsErr[key]=(j&&j.error)||"We could not check this client's staff. Try Check again.";load(true)}
@@ -51096,7 +51234,9 @@ function stepsPage(c,state,run){const id=c.locationId;const inp=bsInputs(c,state
  for(let i=0;i<n;i++){const ck=id+":"+i;
   /* A Change closes itself once that step is done with a different answer (review of 64da59d, LOW 15). */
   if(bsChange[ck]&&pr.done[i]&&typeof bsChange[ck]==="string"&&bsSummary(i,c,state)!==bsChange[ck])delete bsChange[ck];
-  const li=mk("li","bs-step");li.id="step-"+(i+1);const open=(i===pr.current)||Boolean(bsChange[ck]);
+  /* Step 7 stays open while what the last Add them for me said, or its refusal, is there to read (3.90.1). */
+  const staffNews=i===6&&(((bsStaffSaid[id]||[]).length>0)||Boolean(bsErr["staff:"+id]));
+  const li=mk("li","bs-step");li.id="step-"+(i+1);const open=(i===pr.current)||Boolean(bsChange[ck])||staffNews;
   const num=mk("span","bs-num",String(i+1));num.setAttribute("aria-hidden","true");li.appendChild(num);const main=mk("div","bs-main");li.appendChild(main);
   if(open){li.className+=" bs-now";main.appendChild(mk("div","bs-kicker","Step "+(i+1)+" of "+n+(i===pr.current?" · do this now":" · changing")));main.appendChild(mk("h3","bs-title",BS_NAMES[i]));main.appendChild(mk("p","muted",BS_ABOUT[i]));
    if(inp.parked&&i>=2){main.appendChild(mk("p","cds-callout info","This is a "+TYPE_LABELS[typeOf(state,id)].toLowerCase()+" account, so nothing is built into it. Change step 2 to Client or Practice sandbox to build it."))}
@@ -56513,9 +56653,14 @@ function previewFingerprint(p) {
     locationId: p.locationId,
     planHash: p.planHash,
     reuse: p.reuse.map((e) => e.key).sort(),
-    change: p.change.map((e) => [e.key, (e.changes ?? []).map(stableChange).sort(), e.state ?? ""]).sort((a, b) => String(a[0]).localeCompare(String(b[0])))
+    change: p.change.map((e) => [e.key, (e.changes ?? []).map(stableChange).sort(), e.state ?? ""]).sort((a, b) => String(a[0]).localeCompare(String(b[0]))),
+    // 3.90.1 (Codex on e4734bc4): the logins the confirmation names are part of what was confirmed.
+    logins: (p.logins ?? []).map((l) => `${l.email.trim().toLowerCase()}|${l.name}|${l.role}`).sort()
   });
 }
+function previewNamesLogins(preview) {
+  return Boolean(preview && Array.isArray(preview.logins));
+}
 function composePreview(input) {
   const reuse = [];
   const change = [];
@@ -56540,7 +56685,7 @@ function composePreview(input) {
     else reuse.push({ key: key2, type: item.type, name: item.name, id: item.existingId });
   }
   if (input.board) change.push({ key: `${BOARD_KEY_PREFIX}${input.board.id}`, type: "customValues", name: input.board.name, id: input.board.id, changes: [BOARD_CHANGE] });
-  const core = { locationId: input.locationId, planHash: input.planHash, reuse, change };
+  const core = { locationId: input.locationId, planHash: input.planHash, reuse, change, logins: [...input.logins ?? []] };
   return { v: 1, recordKey: input.recordKey, at: input.at ?? (/* @__PURE__ */ new Date()).toISOString(), createCount, createByType, ...core, fingerprint: previewFingerprint(core) };
 }
 function allowedWorkflowIds(allow) {
@@ -56560,6 +56705,7 @@ function boardAllowed(preview, confirm2) {
   return Boolean(confirm2 && confirm2.fingerprint === preview.fingerprint && confirm2.allow.includes(board.key));
 }
 function confirmMatches(confirm2, preview) {
+  if (!previewNamesLogins(preview)) return false;
   if (!confirm2 || confirm2.fingerprint !== preview.fingerprint || !Array.isArray(confirm2.allow)) return false;
   const changeKeys = new Set(preview.change.map((e) => e.key));
   return confirm2.allow.every((k) => changeKeys.has(k));
@@ -57046,7 +57192,6 @@ __export(dashboard_exports, {
   overlayPath: () => overlayPath,
   parseIntakeShape: () => parseIntakeShape,
   planClaimChecks: () => planClaimChecks,
-  prefillTeamAnswers: () => prefillTeamAnswers,
   proPickerHtml: () => proPickerHtml,
   queueScanFilter: () => queueScanFilter,
   queueScanOnce: () => queueScanOnce,
@@ -57092,6 +57237,7 @@ __export(dashboard_exports, {
   stateSaveFs: () => stateSaveFs,
   statusFromThisRun: () => statusFromThisRun,
   syncVerifyVerdict: () => syncVerifyVerdict,
+  teamAnswersFromRoster: () => teamAnswersFromRoster,
   uniqueDocName: () => uniqueDocName,
   unknownCapabilityHtml: () => unknownCapabilityHtml,
   unverifiedStaffNames: () => unverifiedStaffNames,
@@ -57365,6 +57511,12 @@ function offeredFeaturesFor(state2, recordKey) {
 function boughtWordingFor(state2, recordKey) {
   return { programFollowUp: programFollowUpName(presetWorkflowsFor(state2, recordKey)) };
 }
+function savedPlanTeamIsCurrent(sp, answers, questions) {
+  const users = sp.plan && typeof sp.plan === "object" ? sp.plan.users : void 0;
+  const planUsers2 = Array.isArray(users) ? users.filter((u) => Boolean(u) && typeof u.email === "string") : [];
+  const label2 = questions.find((q3) => q3.key === STAFF_INTAKE_KEYS.staff)?.label;
+  return planTeamMatches(planUsers2, listedStaff(void 0, intakeAnswer(answers, STAFF_INTAKE_KEYS.staff, label2)).people);
+}
 function documentScopeFor(state2, locationId2, savedPlan) {
   const sc = state2.scope?.[locationId2];
   const offered = offeredFeaturesFor(state2, locationId2);
@@ -57530,9 +57682,11 @@ function startRun(locationId2, stage, onDone, meta = {}) {
     // changed selection composes the plan fresh from the preset (delta round 3, T-M4).
     // Rehearsal 5 (BUG-2026-09-30-10): Build is told who the staff check matched in this account.
     ...stage === 3 ? { verifiedStaff: verifiedStaffNames(state2.staffChecks?.[locationId2]) } : {},
+    // A saved plan is reused only for the team the rule gives now (3.90.1): one saved under an older team (a draft,
+    // or before Your team decided) is made again, never built with someone the member was not shown.
     savedPlan: (() => {
       const sp = stage === 3 ? readSavedPlan(rk) : null;
-      return sp && sp.inputHash === meta.inputHash && savedPlanMatchesScope(sp, state2.scope?.[rk]) ? { planId: sp.planId, savedAt: sp.savedAt, summary: planSummary(sp) } : void 0;
+      return sp && sp.inputHash === meta.inputHash && savedPlanMatchesScope(sp, state2.scope?.[rk]) && savedPlanTeamIsCurrent(sp, meta.normalizedAnswers, composed) ? { planId: sp.planId, savedAt: sp.savedAt, summary: planSummary(sp) } : void 0;
     })(),
     textSnippets: Boolean(state2.textSnippets?.[rk])
   };
@@ -59411,13 +59565,19 @@ a.textContent="Open Your agency";box.appendChild(a);return box}
    person listed here is found in the account by email. The server reads the account every
    time; nothing on this panel is taken as proof on its own. */
 let staffBusy={},staffSaid={},staffErr={};
+/* Whether Add them for me would make this person an admin (the check's own creations, never guessed here). */
+function staffAdminFor(check,m){const cr=((check&&check.creations)||[]).find(x=>x.email===String(m.email).trim().toLowerCase());return Boolean(cr&&cr.role==="admin")}
 function staffCard(c,state){const box=document.createElement("section");box.className="cds-panel ipanel staffstep";box.id="staff-"+c.locationId;
  const check=(state.staffChecks||{})[c.locationId];const roster=(state.staffRoster||{})[c.locationId]||{};
  const h=document.createElement("h3");h.className="cds-panel-title";h.textContent=check&&check.status==="ready"?"Your staff are in place":"Add your staff";box.appendChild(h);
  box.appendChild(mk("p","",check?check.headline+". "+check.body:"Calendars and lead alerts need real people. List everyone who takes appointments and everyone who should hear about new leads. We check this client's account for each email address before anything is built."));
- if(check&&(check.matched||[]).length){const ul=mk("ul","cds-list");for(const m of check.matched){const li=mk("li");li.appendChild(mk("span","ttl",m.name+" ("+m.email+")"));const end=mk("span","end");end.appendChild(chip("ok","In the account"));li.appendChild(end);ul.appendChild(li)}
-  for(const m of check.missing||[]){const li=mk("li");li.appendChild(mk("span","ttl",m.name+" ("+m.email+")"));const end=mk("span","end");end.appendChild(chip("warn","Not in the account yet"));li.appendChild(end);ul.appendChild(li)}box.appendChild(ul)}
- else if(check&&(check.missing||[]).length){const ul=mk("ul","cds-list");for(const m of check.missing){const li=mk("li");li.appendChild(mk("span","ttl",m.name+" ("+m.email+")"));const end=mk("span","end");end.appendChild(chip("warn","Not in the account yet"));li.appendChild(end);ul.appendChild(li)}box.appendChild(ul)}
+ /* One listing in every state (3.90.1, Codex on 516081d8): where the list came from, then each person with their
+    job, and "Admin login" on anyone Add them for me would make an admin, before it can be pressed. */
+ if(check&&((check.matched||[]).length||(check.missing||[]).length)){if(check.source&&BS_STAFF_SOURCE[check.source])box.appendChild(mk("p","small",BS_STAFF_SOURCE[check.source]));
+  const ul=mk("ul","cds-list");
+  for(const m of check.matched||[]){const li=mk("li");li.appendChild(mk("span","ttl",m.name+" ("+m.email+")"+(m.role?" \xB7 "+m.role:"")));const end=mk("span","end");end.appendChild(chip("ok","In the account"));li.appendChild(end);ul.appendChild(li)}
+  for(const m of check.missing||[]){const li=mk("li");li.appendChild(mk("span","ttl",m.name+" ("+m.email+")"+(m.role?" \xB7 "+m.role:"")));const end=mk("span","end");const w=(check.waiting||[]).find(x=>x.email===m.email);if(staffAdminFor(check,m))end.appendChild(chip("info",BS_ADMIN_MARK));end.appendChild(w?mk("span","small",w.line):chip("warn","Not in the account yet"));li.appendChild(end);ul.appendChild(li)}
+  box.appendChild(ul)}
  for(const line of (check&&check.steps)||[])box.appendChild(mk("p","small",line));
  if(check&&check.createRefused)box.appendChild(mk("p","small","GoHighLevel does not let this agency add people from outside GoHighLevel, so please add them yourself."));
  if(check&&check.howToAdd)box.appendChild(mk("p","small",check.howToAdd));
@@ -59434,13 +59594,18 @@ function staffCard(c,state){const box=document.createElement("section");box.clas
  /* Rehearsal 3: creating the logins asks in a panel under the button, and what GoHighLevel said (with any
     one-time password) stays on the page until Done, never in confirm() or alert(). The passwords live
     only in this page's memory. */
- if(check&&check.status==="needs_staff"&&check.canAddForYou){const add=document.createElement("button");add.className="cds-btn";add.textContent="Add them for me";const addKey="staffadd:"+c.locationId;
+ if(check&&check.status==="needs_staff"&&check.canAddForYou&&(check.creations||[]).length){const add=document.createElement("button");add.className="cds-btn";add.textContent="Add them for me";const addKey="staffadd:"+c.locationId;
   add.onclick=()=>{let r=null;icShow(add,addKey,{title:"Create GoHighLevel logins in "+c.name+"?",
-   text:[(check.missing||[]).map(m=>m.name+" ("+m.email+")").join(", ")+".","GoHighLevel sends each person an invitation email. We then read the account back to confirm they arrived."],
+   text:[(check.missing||[]).filter(m=>!(check.waiting||[]).some(x=>x.email===m.email)).map(m=>m.name+" ("+m.email+")"+(m.role?" \xB7 "+m.role:"")+(staffAdminFor(check,m)?" \xB7 "+BS_ADMIN_MARK:"")).join(", ")+".","GoHighLevel should email each new person an invitation. We then read the account back to confirm they arrived."],
    ok:"Create the logins",busyLabel:"Creating the logins\u2026",
-   run:async()=>{r=await(await clientPageRequest("/api/staff/add",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({locationId:c.locationId})})).json();
-    return !r||r.ok===false?clientPageError((r&&r.error)||"That did not go through. Click Check again to see where things stand."):""},
-   after:async()=>{const said=(r.results||[]).map(x=>x.said+(x.generatedPassword?" Their one-time password is "+x.generatedPassword+". Give it to them privately; it is not saved anywhere.":""));if(said.length)staffSaid[c.locationId]=said;load()}})};
+   run:async()=>{r=await(await clientPageRequest("/api/staff/add",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({locationId:c.locationId,shown:check.creations||[]})})).json();
+    /* Any answer closes this confirmation (it showed the list as it was) and its lines go to the panel's own box,
+       which stays through the redraw until Done (3.90.1, Codex on e4734bc4); a refusal's team is drawn at once. */
+    const lines=!r?[clientPageError("That did not go through. Click Check again to see where things stand.")]:[...(r.ok===false?[clientPageError(r.error||"That did not go through. Click Check again to see where things stand.")]:[]),...(r.said||[]),...(r.results||[]).filter(x=>x.generatedPassword).map(x=>x.said+" Their one-time password is "+x.generatedPassword+". Give it to them privately; it is not saved anywhere.")];
+    if(lines.length)staffSaid[c.locationId]=lines;
+    if(r&&r.check&&lastState)lastState.staffChecks=Object.assign({},lastState.staffChecks,{[c.locationId]:r.check});
+    return ""},
+   after:async()=>{delete icOpen[addKey];load()}})};
   btns.appendChild(icAfter(add,addKey))}
  box.appendChild(btns);
  if(staffErr[c.locationId])showClientError(staffErr[c.locationId],box);
@@ -60529,7 +60694,7 @@ function renderPage(state,run){if(state.roster)mergeRoster(state.roster);syncRev
   d.appendChild(mk("summary","","Show the "+parked.length+" template and hidden "+plural(parked.length,"account")));
   d.appendChild(listRows(rows.slice(board.length),"clients-parked"));list.appendChild(d)}
  m.appendChild(list)}
-const BS_TEAM_KEYS=${scriptJson(Object.values(STAFF_INTAKE_KEYS))};const BS_TOPICS=${scriptJson(Object.fromEntries(GO_LIVE_TOPICS.map((g) => [g.key, g.title])))};const BS_NAMES=${scriptJson(STEP_NAMES)};const BS_ABOUT=${scriptJson(STEP_ABOUT)};const BS_HOW_TO_ADD=${scriptJson(BS_HOW_TO_ADD)};const BS_TYPE_HELP=${scriptJson(BS_TYPE_HELP)};
+const BS_TEAM_KEYS=${scriptJson(Object.values(STAFF_INTAKE_KEYS))};const BS_ADMIN_MARK=${scriptJson(STAFF_ADMIN_MARK)};const BS_STAFF_SOURCE=${scriptJson(STAFF_SOURCE_WORDS)};const BS_TOPICS=${scriptJson(Object.fromEntries(GO_LIVE_TOPICS.map((g) => [g.key, g.title])))};const BS_NAMES=${scriptJson(STEP_NAMES)};const BS_ABOUT=${scriptJson(STEP_ABOUT)};const BS_HOW_TO_ADD=${scriptJson(BS_HOW_TO_ADD)};const BS_TYPE_HELP=${scriptJson(BS_TYPE_HELP)};
 const stepProgress=(${stepProgress.toString()});
 let bsHideAssess=false;
 ${BUILD_STEPS_SCRIPT}
@@ -60959,15 +61124,31 @@ async function runDashboard(argv) {
     const tok = registry2.getToken(locationId2);
     return tok?.apiKey ? new GHLClient({ apiKey: tok.apiKey, locationId: locationId2 }) : void 0;
   };
-  const staffListedFor = (locationId2) => {
+  const staffListedSaved = (locationId2) => {
     const st = readCockpitState();
     const questions = composeQuestionSet({ industry: st.accounts?.[locationId2]?.industry, agency: readOverlay() });
     const label2 = questions.find((q3) => q3.key === STAFF_INTAKE_KEYS.staff)?.label;
+    const saved = st.intakeCompleted?.[locationId2]?.answers ?? st.intakeInputs?.[locationId2]?.answers;
+    return effectiveStaffList(
+      st.staffRoster?.[locationId2],
+      saved ? { submitted: true, text: intakeAnswer(saved, STAFF_INTAKE_KEYS.staff, label2) } : void 0,
+      intakeAnswer(st.intakeDrafts?.[locationId2]?.answers, STAFF_INTAKE_KEYS.staff, label2)
+    );
+  };
+  void staffListedSaved;
+  const staffListedLive = async (locationId2) => {
+    const st = readCockpitState();
     const roster2 = st.staffRoster?.[locationId2];
-    if (roster2 && String(roster2.lines ?? "").trim()) return listedStaff(roster2);
-    return listedStaff(
-      roster2,
-      intakeAnswer(st.intakeCompleted?.[locationId2]?.answers ?? st.intakeInputs?.[locationId2]?.answers, STAFF_INTAKE_KEYS.staff, label2),
+    if (roster2 && String(roster2.lines ?? "").trim()) return effectiveStaffList(roster2, void 0, void 0);
+    const c = clientFor(locationId2);
+    if (!c) throw new Error("This client is not connected yet.");
+    const snap = await readIntakeSnapshot(c, locationId2);
+    if (snap.status === "unavailable") throw new Error("We could not check this client's staff. Try Check again.");
+    const questions = composeQuestionSet({ industry: st.accounts?.[locationId2]?.industry, agency: readOverlay() });
+    const label2 = questions.find((q3) => q3.key === STAFF_INTAKE_KEYS.staff)?.label;
+    return effectiveStaffList(
+      void 0,
+      { submitted: snap.status === "received", text: intakeAnswer(snap.answers, STAFF_INTAKE_KEYS.staff, label2) },
       intakeAnswer(st.intakeDrafts?.[locationId2]?.answers, STAFF_INTAKE_KEYS.staff, label2)
     );
   };
@@ -60988,18 +61169,47 @@ async function runDashboard(argv) {
       }
     };
   };
+  const staffAddChain = /* @__PURE__ */ new Map();
+  const oneStaffAddAtATime = (locationId2, run) => {
+    const tail = (staffAddChain.get(locationId2) ?? Promise.resolve()).then(run, run).catch(() => void 0);
+    staffAddChain.set(locationId2, tail);
+    void tail.then(() => {
+      if (staffAddChain.get(locationId2) === tail) staffAddChain.delete(locationId2);
+    });
+    return tail;
+  };
+  const holdStaff = (locationId2, email, v) => {
+    const latest = readCockpitState();
+    const mine = { ...latest.staffPending?.[locationId2] ?? {} };
+    if (v) mine[normEmail(email)] = v;
+    else delete mine[normEmail(email)];
+    writeCockpitState({ ...latest, staffPending: { ...latest.staffPending, [locationId2]: mine } });
+  };
+  const endSeenHolds = (locationId2, check) => {
+    const latest = readCockpitState();
+    const was = latest.staffPending?.[locationId2];
+    if (!was) return;
+    const now = pendingSeen(was, check);
+    if (Object.keys(now).length !== Object.keys(was).length) writeCockpitState({ ...latest, staffPending: { ...latest.staffPending, [locationId2]: now } });
+  };
   const saveStaffCheck = (locationId2, check) => {
     const latest = readCockpitState();
     writeCockpitState({ ...latest, staffChecks: { ...latest.staffChecks, [locationId2]: check } });
   };
   const staffCheckFor = async (locationId2, save = true) => {
-    const check = await readStaffCheck(staffDepsFor(locationId2), staffListedFor(locationId2));
-    if (save) saveStaffCheck(locationId2, check);
+    const listed = await staffListedLive(locationId2);
+    const check = applyStaffPending(await readStaffCheck(staffDepsFor(locationId2), listed), readCockpitState().staffPending?.[locationId2], Date.now());
+    if (listed.source) check.source = listed.source;
+    if (save) {
+      saveStaffCheck(locationId2, check);
+      endSeenHolds(locationId2, check);
+    }
     return check;
   };
   staffGateRef = async (locationId2, stage) => {
     if (!STAFF_GATED_STAGES.has(stage)) return null;
-    return staffGateReason(await staffCheckFor(locationId2), STAGES2[stage] === "Staged Build" ? "Build" : STAGES2[stage]);
+    const check = await staffCheckFor(locationId2).catch(() => checkStaff({ people: [], skipped: [] }, { error: "unreadable" }, { canAddForYou: false }));
+    return staffGateReason(check, STAGES2[stage] === "Staged Build" ? "Build" : STAGES2[stage]);
   };
   const readAgencySnapshots = async () => {
     const agencyKey = registry2.getAgencyKey();
@@ -61900,25 +62110,82 @@ ${opportunityNoteFailure?.detail ?? ""}`);
       return;
     }
     if (req.method === "POST" && url === "/api/staff/add") {
-      readBody(req, res, 2e3, async (body) => {
+      readBody(req, res, 2e4, async (body) => {
+        let queued = "";
         try {
-          const { locationId: locationId2 } = JSON.parse(body);
-          if (typeof locationId2 !== "string" || !readableAccount(locationId2)) throw new Error("Choose a registered client.");
-          const perm = buildPermission(locationId2, { name: currentRoster().find((r) => r.locationId === locationId2)?.name, approvedAt: (/* @__PURE__ */ new Date()).toISOString() });
-          if (!perm.allowed) throw new Error(perm.reason);
-          const out = await addMissingStaff(staffDepsFor(locationId2), staffListedFor(locationId2));
-          if (out.check.createRefused) {
-            const latest = readCockpitState();
-            writeCockpitState({ ...latest, staffAddRefused: { ...latest.staffAddRefused, [locationId2]: (/* @__PURE__ */ new Date()).toISOString() } });
-          }
-          saveStaffCheck(locationId2, out.check);
-          writeCockpitState(recordStaffAdd(readCockpitState(), locationId2, currentActor()));
-          res.writeHead(200, { "Content-Type": "application/json" });
-          res.end(JSON.stringify({ ok: true, ...out }));
-        } catch (e) {
-          res.writeHead(400, { "Content-Type": "application/json" });
-          res.end(JSON.stringify({ ok: false, error: e instanceof Error ? e.message : "bad request" }));
+          const id = JSON.parse(body).locationId;
+          if (typeof id === "string") queued = id;
+        } catch {
         }
+        await oneStaffAddAtATime(queued, async () => {
+          try {
+            const { locationId: locationId2, shown: shownRaw } = JSON.parse(body);
+            if (typeof locationId2 !== "string" || !readableAccount(locationId2)) throw new Error("Choose a registered client.");
+            const perm = buildPermission(locationId2, { name: currentRoster().find((r) => r.locationId === locationId2)?.name, approvedAt: (/* @__PURE__ */ new Date()).toISOString() });
+            if (!perm.allowed) throw new Error(perm.reason);
+            const deps = staffDepsFor(locationId2);
+            const listed = await staffListedLive(locationId2);
+            const live = applyStaffPending(await readStaffCheck(deps, listed), readCockpitState().staffPending?.[locationId2], Date.now());
+            if (listed.source) live.source = listed.source;
+            const shown = parseShownCreations(shownRaw);
+            if (live.status === "unreadable") throw new Error("We could not check this client's staff. Try Check again.");
+            const changed = shown ? sameCreations(shown, live.creations ?? []) ? [] : ["the team changed"] : ["this page did not send the list it showed; reload the page"];
+            if (!shown || changed.length) {
+              saveStaffCheck(locationId2, live);
+              const refusal2 = staleRefusal("the team", changed);
+              res.writeHead(refusal2.status, { "Content-Type": "application/json" });
+              res.end(JSON.stringify({ ...refusal2.body, check: live }));
+              return;
+            }
+            const out = await addMissingStaff({ ...deps, createUser: async (u) => {
+              const at = (/* @__PURE__ */ new Date()).toISOString();
+              const name = [u.firstName, u.lastName === "-" ? "" : u.lastName].filter(Boolean).join(" ");
+              holdStaff(locationId2, u.email, { name, at, phase: "creating" });
+              const outcome = await deps.createUser(u);
+              if (outcome.ok && outcome.status === "created") holdStaff(locationId2, u.email, { name, at, phase: "created" });
+              else if (outcome.ok || createMadeNothing(outcome)) holdStaff(locationId2, u.email, void 0);
+              return outcome;
+            } }, listed, void 0, live);
+            out.check = applyStaffPending(out.check, readCockpitState().staffPending?.[locationId2], Date.now());
+            if (out.check.createRefused) {
+              const latest = readCockpitState();
+              writeCockpitState({ ...latest, staffAddRefused: { ...latest.staffAddRefused, [locationId2]: (/* @__PURE__ */ new Date()).toISOString() } });
+            }
+            writeCockpitState(recordStaffAdd(readCockpitState(), locationId2, currentActor()));
+            let said = staffAddSaid(out.results);
+            const createdOf = () => out.results.filter((r) => r.status === "created").map((r) => normEmail(r.email));
+            let created = createdOf();
+            const after = await staffListedLive(locationId2).catch(() => null);
+            const reply = (status, body2) => {
+              res.writeHead(status, { "Content-Type": "application/json" });
+              res.end(JSON.stringify(body2));
+            };
+            if (!after) {
+              saveStaffCheck(locationId2, out.check);
+              reply(409, { ok: false, written: created.length > 0, error: staffUncheckedLine(out.results), said, results: out.results, created, check: out.check });
+              return;
+            }
+            const fresh = applyStaffPending(await readStaffCheck(deps, after), readCockpitState().staffPending?.[locationId2], Date.now());
+            if (fresh.status === "unreadable") {
+              saveStaffCheck(locationId2, out.check);
+              reply(409, { ok: false, written: created.length > 0, error: staffUncheckedLine(out.results), said, results: out.results, created, check: out.check });
+              return;
+            }
+            if (after.source) fresh.source = after.source;
+            if (out.check.createRefused) fresh.createRefused = true;
+            fresh.canAddForYou = fresh.canAddForYou && out.check.canAddForYou;
+            saveStaffCheck(locationId2, fresh);
+            endSeenHolds(locationId2, fresh);
+            said = staffAddSaid(settleResults(out.results, fresh));
+            created = createdOf();
+            const listedNow = new Set(after.people.map((p) => normEmail(p.email)));
+            for (const r of out.results) if (r.status === "created" && !listedNow.has(normEmail(r.email))) said.push(staffNotOnTeamLine(r.name));
+            reply(200, { ok: true, said, results: out.results, created, check: fresh });
+          } catch (e) {
+            res.writeHead(400, { "Content-Type": "application/json" });
+            res.end(JSON.stringify({ ok: false, error: e instanceof Error ? e.message : "bad request" }));
+          }
+        });
       });
       return;
     }
@@ -62099,7 +62366,7 @@ ${opportunityNoteFailure?.detail ?? ""}`);
             inputHash = intakeInput(normalizedAnswers, st0.accounts?.[locationId2]?.industry, composeQuestionSet({ industry: st0.accounts?.[locationId2]?.industry, agency: readOverlay() }));
             st0 = { ...st0, intakeInputs: { ...st0.intakeInputs, [locationId2]: { hash: inputHash, answers: normalizedAnswers, status: bound.status, shape: intakeShapeOf(snap) } } };
             writeCockpitState(st0);
-            if (stage !== 4) normalizedAnswers = prefillTeamAnswers(normalizedAnswers, st0.staffRoster?.[locationId2], composeQuestionSet({ industry: st0.accounts?.[locationId2]?.industry, agency: readOverlay() }));
+            if (stage !== 4) normalizedAnswers = teamAnswersFromRoster(normalizedAnswers, st0.staffRoster?.[locationId2], composeQuestionSet({ industry: st0.accounts?.[locationId2]?.industry, agency: readOverlay() }));
             if (stage >= 3) {
               assertBuildApproval(st0.planApprovals?.[locationId2], inputHash);
               if (stage === 3) assertStaffUnchanged(st0.planApprovals?.[locationId2], st0.staffRoster?.[locationId2]);
@@ -62235,7 +62502,7 @@ ${opportunityNoteFailure?.detail ?? ""}`);
           const industry = st.accounts?.[locationId2]?.industry;
           const questions = composeQuestionSet({ industry, agency: readOverlay() }).map((q3) => ({ key: q3.key, contactTag: q3.field.kind === "standard" ? q3.field.tag : void 0, label: q3.label, sectionLabel: q3.sectionLabel, required: q3.required, options: q3.options ?? null, placeholder: q3.placeholder ?? "", multi: q3.field.kind === "custom" && q3.field.dataType === "MULTIPLE_OPTIONS" }));
           const completed = st.intakeCompleted?.[locationId2];
-          const answers = completed ? completed.answers : fillBusinessType(prefillTeamAnswers(normalizedIntake(snap, st.intakeDrafts?.[locationId2]), st.staffRoster?.[locationId2], questions), industry, questions);
+          const answers = completed ? completed.answers : fillBusinessType(teamAnswersFromRoster(normalizedIntake(snap, st.intakeDrafts?.[locationId2]), st.staffRoster?.[locationId2], questions), industry, questions);
           const latestState = readCockpitState();
           const bound = boundIntake(latestState, locationId2, snap);
           const submittedAnswers = bound.answers;
@@ -62841,7 +63108,7 @@ ${opportunityNoteFailure?.detail ?? ""}`);
           const current = readCockpitState();
           if (!current.buildApproved?.[rk]) throw new Error("Approve building (step 8) before confirming the build.");
           const preview = readBuildPreview(rk);
-          if (!preview || typeof fingerprint !== "string" || preview.fingerprint !== fingerprint) throw new Error("This list is out of date. Start the build again to see the current one.");
+          if (!preview || !previewNamesLogins(preview) || typeof fingerprint !== "string" || preview.fingerprint !== fingerprint) throw new Error("This list is out of date. Start the build again to see the current one.");
           const changeKeys = new Set(preview.change.map((e) => e.key));
           const allowed = Array.isArray(allow) ? [...new Set(allow.filter((k) => typeof k === "string"))] : [];
           if (allowed.some((k) => !changeKeys.has(k))) throw new Error("Only items on the list can be changed.");
@@ -78723,7 +78990,8 @@ function registerIntakeToBuildTools(server2, client, builderClient, registry2) {
             return jsonResponse({ ok: false, phase: "confirm", error: `Command OS could not read this account's custom values (${e instanceof Error ? e.message : String(e)}), so it cannot list what Build would change. Nothing was written. Run Build again.` });
           }
           const { changes: workflowChanges, states: workflowStates } = await previewWorkflowChanges(deps, result, ours, saved?.calendarPending);
-          const preview = composePreview({ locationId: activeLocation, recordKey, planHash: contentHash(typedPlan), items: result.items, ours, workflowChanges, workflowStates, board });
+          const logins = (typedPlan.users ?? []).filter((u) => result.items.some((i) => i.ref === u.ref && i.type === "users" && i.status === "would_create")).map((u) => ({ name: [u.firstName, u.lastName === "-" ? "" : u.lastName].filter(Boolean).join(" "), email: u.email, role: u.role }));
+          const preview = composePreview({ locationId: activeLocation, recordKey, planHash: contentHash(typedPlan), items: result.items, ours, workflowChanges, workflowStates, board, logins });
           try {
             saveBuildPreview(preview);
           } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elitedcs/ghl-mcp",
-  "version": "3.90.0",
+  "version": "3.90.1",
   "mcpName": "io.github.drjerryrelth/ghl-command",
   "description": "GoHighLevel MCP Server for Claude. 250 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",