@leadbay/mcp 0.39.1 → 0.39.3

package/dist/bin.js

@@ -6731,7 +6731,7 @@ prose paragraph. Full recipe below.
 
 Build a single-call mixed-mode itinerary for a field sales tour. Combines \`leadbay_pull_followups\` (Monitor leads in the city \u2014 known accounts) with \`leadbay_pull_leads\` (Discover wishlist \u2014 new prospects, then client-side filtered by city) so the agent can answer the canonical #3630 US1 ask: *"I'm visiting Limoges in 4 days \u2014 propose 3 customers + 3 qualified prospects + 3 new high-potential discoveries."*
 
-**Geo resolution** is identical to \`leadbay_followups_map\`: pass \`city\` (any level from state down to neighborhood \u2014 state, *r\xE9gion*, county, city \u2014 the \`/geo/search\` resolver picks the best match), or a pre-resolved \`city_id\`. Ambiguous matches surface as \`status: "ambiguous_locations"\` + \`location_ambiguities[]\`; pick an id and re-call with \`city_id\`.
+**Geo resolution** is identical to \`leadbay_followups_map\`: pass \`city\` (any level from state down to neighborhood \u2014 state, *r\xE9gion*, county, city \u2014 the \`/geo/search\` resolver picks the best match), or a pre-resolved \`city_id\`. Ambiguous matches surface as \`status: "ambiguous_locations"\` + \`location_ambiguities[]\`; re-call with \`city_id\` set to the id you pick AND \`city\` set to that candidate's \`name\`. Both are needed: the id scopes the follow-ups, the name scopes the Discover leads, and with \`city_id\` alone \`discover_leads\` comes back empty.
 
 **One workspace = one country \u2014 a country name is NEVER a location filter.** The admin-area index holds no country nodes, so \`"France"\` matches the *commune of Francs* and \`"United States"\` matches *Statesboro*: the call is silently fenced to one village and every conclusion from it is wrong. City AND country named? Keep the city, drop the country.
 
@@ -6761,7 +6761,7 @@ not an itinerary. So for ANY country-level \`city\` \u2014 this workspace's own
 visiting and re-call with that. \`status: "country_level_location"\` carries the
 same instruction in its \`hint\`.
 
-**Counts**: \`followups_count\` (default 6 \u2014 generous so the agent can split into "customers + qualified" client-side) and \`discover_count\` (default 6 after client-side geo filter). The composite over-pulls Discover (30 raw) because the wishlist endpoint has no server-side geo filter \u2014 it then filters by \`location.city/state/country/full\` substring match against the requested city. The \`discover_filter_note\` string in the response tells the agent the match ratio so it can be honest about coverage ("matched 3/30 by city/state" vs. "matched 12/30").
+**Counts**: \`followups_count\` (default 6 \u2014 generous so the agent can split into "customers + qualified" client-side) and \`discover_count\` (default 6 after client-side geo filter). The composite over-pulls Discover (30 raw) because the wishlist endpoint has no server-side geo filter \u2014 it then keeps the leads whose own \`location.city\` names the requested city, and falls back to \`location.state\` only when no city matched (which is what a regional ask like "Texas" or "\xCEle-de-France" looks like). \`location.country\` is never consulted. \`discover_filter_note\` reports the ratio and which field carried it, so the agent can be honest about coverage. **When it says no Discover lead is in the city, say that** \u2014 return the Monitor half and offer \`leadbay_find_new_leads\` for that city. Never fill the gap with leads from elsewhere.
 
 **What \`tour_plan\` does NOT do**: it doesn't persist the tour as a campaign artifact. To do that \u2014 create a "Limoges Tour \u2013 May 24" campaign and attach the selected accounts \u2014 chain into \`leadbay_create_campaign({lead_ids: [...selected_ids], name: 'Limoges Tour \u2013 <date>'})\` after the user picks. See the \`leadbay_plan_tour_in_city\` prompt for the full end-to-end orchestrator.
 
@@ -14249,8 +14249,8 @@ function summarise(responses) {
   return { answered, total, avg_qualification_boost: avg, best_response_excerpt: excerpt };
 }
 function buildPullLeadsNextSteps(args) {
-  const { leadCount, hasMore, nextPage, computingWishlist, computingScores } = args;
-  if (leadCount <= 0) {
+  const { leadCount: leadCount2, hasMore, nextPage, computingWishlist, computingScores } = args;
+  if (leadCount2 <= 0) {
     if (computingWishlist || computingScores) {
       return {
         question: "This lens is still warming up. What next?",
@@ -14503,15 +14503,15 @@ var init_pull_leads = __esm({
         const currentPage = res.pagination?.page ?? page;
         const hasMore = currentPage < totalPages - 1;
         const nextPage = hasMore ? currentPage + 1 : null;
-        const leadCount = res.items.length;
+        const leadCount2 = res.items.length;
         const nextSteps = buildPullLeadsNextSteps({
-          leadCount,
+          leadCount: leadCount2,
           hasMore,
           nextPage,
           computingWishlist: res.computing_wishlist,
           computingScores: res.computing_scores
         });
-        const lensIsEmpty = leadCount === 0 && (res.pagination?.total ?? 0) === 0;
+        const lensIsEmpty = leadCount2 === 0 && (res.pagination?.total ?? 0) === 0;
         const emptyReason = lensIsEmpty ? await diagnoseEmptyLens(client, lensId, {
           wishlist: res.computing_wishlist,
           scores: res.computing_scores
@@ -14962,13 +14962,33 @@ var init_followups_map = __esm({
 });
 
 // ../core/dist/composite/tour-plan.js
-function cityMatches(lead, cityHint) {
-  if (!cityHint)
-    return true;
-  const hint = cityHint.toLowerCase();
-  const loc = lead?.location ?? {};
-  const haystacks = [loc.city, loc.state, loc.country, loc.full].filter((v) => typeof v === "string").map((v) => v.toLowerCase());
-  return haystacks.some((h) => h.includes(hint) || hint.includes(h));
+function normalizeGeo(value) {
+  return value.normalize("NFD").replace(/[\u0300-\u036f]/g, "").toLowerCase().replace(/[^a-z0-9]+/g, " ").trim();
+}
+function townName(value) {
+  return normalizeGeo(value).replace(ADMIN_PREFIX, "");
+}
+function cityHintCore(cityHint) {
+  const head = cityHint.split(",")[0] ?? "";
+  const expanded = expandAlias(head);
+  return { name: townName(expanded), isCity: expanded !== head };
+}
+function stateFieldOf(lead) {
+  const state = lead?.location?.state;
+  return typeof state === "string" ? normalizeGeo(state) : "";
+}
+function filterDiscoverByCity(leads, cityHint) {
+  const hint = cityHint ? cityHintCore(cityHint) : { name: "", isCity: false };
+  if (!hint.name)
+    return { leads, matchedOn: null };
+  const cityOf = (l) => typeof l?.location?.city === "string" ? townName(l.location.city) : "";
+  const byCity = leads.filter((l) => cityOf(l) === hint.name);
+  if (byCity.length > 0)
+    return { leads: byCity, matchedOn: "city" };
+  if (hint.isCity)
+    return { leads: [], matchedOn: "city" };
+  const byState = leads.filter((l) => stateFieldOf(l) === hint.name);
+  return { leads: byState, matchedOn: "state" };
 }
 function toMapLocation(lead, mode) {
   const pos = lead?.location?.pos;
@@ -15018,7 +15038,7 @@ function buildMap(monitorLeads, discoverLeads2) {
     }
   };
 }
-var DEFAULT_FOLLOWUPS_COUNT, DEFAULT_DISCOVER_COUNT, DISCOVER_OVER_PULL, tourPlan;
+var DEFAULT_FOLLOWUPS_COUNT, DEFAULT_DISCOVER_COUNT, DISCOVER_OVER_PULL, ADMIN_PREFIX, tourPlan;
 var init_tour_plan = __esm({
   "../core/dist/composite/tour-plan.js"() {
     "use strict";
@@ -15026,10 +15046,12 @@ var init_tour_plan = __esm({
     init_pull_leads();
     init_interactions();
     init_country_guard();
+    init_geo_helpers();
     init_tool_descriptions_generated();
     DEFAULT_FOLLOWUPS_COUNT = 6;
     DEFAULT_DISCOVER_COUNT = 6;
     DISCOVER_OVER_PULL = 30;
+    ADMIN_PREFIX = /^(?:city|town|village|borough|township|municipality) of /;
     tourPlan = {
       name: "leadbay_tour_plan",
       annotations: {
@@ -15049,7 +15071,7 @@ var init_tour_plan = __esm({
           },
           city_id: {
             type: "string",
-            description: "Pre-resolved admin_area id (numeric string). Bypasses the resolver."
+            description: "Pre-resolved admin_area id (numeric string). Bypasses the resolver. Pass `city` alongside it with the NAME of the area you picked: the id scopes the Monitor half, and the name is the only thing that can scope the Discover half, which has no server-side geo filter. With `city_id` alone, `discover_leads` comes back empty."
           },
           followups_count: {
             type: "number",
@@ -15156,7 +15178,13 @@ var init_tour_plan = __esm({
         const discoverCount = params.discover_count ?? DEFAULT_DISCOVER_COUNT;
         const [followupsResult, leadsResult] = await Promise.allSettled([
           pullFollowups.execute(client, {
-            city: params.city,
+            // A pre-resolved id bypasses the resolver, which is what its own
+            // schema promises. Forwarding the free text alongside it sends the
+            // name back through /geo/search, and the name is the thing that was
+            // ambiguous — so an agent recovering from `ambiguous_locations` by
+            // picking an id would be handed the same ambiguity again. Here the
+            // free text stays behind and scopes the Discover half instead.
+            city: params.city_id ? void 0 : params.city,
             city_id: params.city_id,
             count: followupsCount
           }, ctx),
@@ -15170,7 +15198,7 @@ var init_tour_plan = __esm({
               location_ambiguities: r.location_ambiguities,
               monitor_leads: [],
               discover_leads: [],
-              discover_filter_note: "City was ambiguous; pick an id and re-call to proceed.",
+              discover_filter_note: "City was ambiguous; re-call with `city_id` set to the id you pick AND `city` set to that candidate's `name`. The id scopes the follow-ups; the name is what scopes the Discover leads.",
               map_locations: [],
               map_summary: {
                 total_leads: 0,
@@ -15194,13 +15222,27 @@ var init_tour_plan = __esm({
         if (leadsResult.status === "rejected") {
           ctx?.logger?.warn?.(`tour_plan: pull_leads failed: ${leadsResult.reason?.message ?? leadsResult.reason}`);
         }
-        const filtered = rawDiscover.filter((l) => cityMatches(l, params.city));
+        const cityName = params.city && !/^\d+$/.test(params.city.trim()) ? params.city : void 0;
+        const knownId = params.city_id ?? (cityName ? void 0 : params.city);
+        const idOnly = Boolean(knownId) && !cityName;
+        const { leads: filtered, matchedOn } = idOnly ? { leads: [], matchedOn: null } : filterDiscoverByCity(rawDiscover, cityName);
         const discoverLeads2 = filtered.slice(0, discoverCount);
         const pulledLensId = leadsResult.status === "fulfilled" ? leadsResult.value?.lens?.id : null;
         if (pulledLensId != null) {
           reportLeadInteractions(client, pulledLensId, discoverLeads2.map((l) => l.id), ["LEAD_SEEN"], ctx?.logger);
         }
-        const filterNote = params.city ? `Matched ${filtered.length}/${rawDiscover.length} Discover leads to '${params.city}'; returning top ${discoverLeads2.length}.` : `No city filter applied; returning top ${discoverLeads2.length} Discover leads.`;
+        let filterNote;
+        if (idOnly) {
+          filterNote = `Discover leads need the NAME of the place, and this call passed an area id (${knownId}) and no name. Re-call with \`city\` set to the name of that area, keeping \`city_id\` so the Monitor half stays on the area you picked. The follow-ups below are already scoped to it.`;
+        } else if (!cityName) {
+          filterNote = `No city filter applied; returning top ${discoverLeads2.length} Discover leads.`;
+        } else if (matchedOn === null) {
+          filterNote = `No usable city filter in '${params.city}'; returning top ${discoverLeads2.length} Discover leads.`;
+        } else if (filtered.length === 0) {
+          filterNote = `No Discover lead in the active lens is in '${params.city}' (checked ${rawDiscover.length} candidates by city, then by state/region). Say so; do NOT present leads from elsewhere as if they were in '${params.city}'.`;
+        } else {
+          filterNote = `Matched ${filtered.length}/${rawDiscover.length} Discover leads to '${params.city}' by ${matchedOn === "city" ? "city" : "state/region"}; returning top ${discoverLeads2.length}.`;
+        }
         return {
           city: params.city ?? null,
           city_id: params.city_id ?? null,
@@ -20766,27 +20808,167 @@ var init_bulk_enrich_status = __esm({
   }
 });
 
-// ../core/dist/composite/adjust-audience.js
-function tokens(s) {
-  if (!s)
-    return [];
-  return s.toLowerCase().split(/[^\p{L}\p{N}]+/u).filter(Boolean);
+// ../core/dist/composite/_sector-resolver.js
+function normalizeSectorText(value) {
+  return (value ?? "").normalize("NFD").replace(/[\u0300-\u036f]/g, "").toLowerCase().replace(/[^0-9a-z]+/g, " ").trim();
 }
-function bestMatches(text3, taxonomy) {
-  const want = new Set(tokens(text3));
-  if (want.size === 0)
-    return [];
-  const ranked = taxonomy.map((s) => {
-    const have = new Set(tokens(s.name));
+function singular(token) {
+  if (token.length > 4 && token.endsWith("ies"))
+    return `${token.slice(0, -3)}y`;
+  return token.length > 3 && token.endsWith("s") ? token.slice(0, -1) : token;
+}
+function sectorTokens(value) {
+  const all = normalizeSectorText(value).split(" ").filter(Boolean).map(singular);
+  const core = all.filter((t) => !FILLER.has(t));
+  return core.length > 0 ? core : all;
+}
+function sectorLabel(row) {
+  if (!row)
+    return "";
+  const label = row.label;
+  if (typeof label === "string" && label.length > 0)
+    return label;
+  return typeof row.name === "string" ? row.name : "";
+}
+function leadCount(row) {
+  const n = row.number_of_leads;
+  return typeof n === "number" && Number.isFinite(n) ? n : 0;
+}
+function rankCandidates(scored, tieBreak) {
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  scored.sort((a, b) => b.score - a.score || (tieBreak === "breadth" ? leadCount(b.row) - leadCount(a.row) || b.closeness - a.closeness : b.closeness - a.closeness || leadCount(b.row) - leadCount(a.row)) || sectorLabel(a.row).length - sectorLabel(b.row).length).forEach(({ row, score }) => {
+    const label = sectorLabel(row);
+    if (!label || seen.has(label) || out.length >= MAX_CANDIDATES)
+      return;
+    seen.add(label);
+    out.push({ id: row.id, name: label, score: Number(score.toFixed(2)) });
+  });
+  return out;
+}
+function matchSector(text3, taxonomy) {
+  const wanted = normalizeSectorText(text3);
+  if (!wanted)
+    return { kind: "unresolved", candidates: [] };
+  const exact = taxonomy.filter((row) => normalizeSectorText(sectorLabel(row)) === wanted);
+  if (exact.length > 0) {
+    const label = sectorLabel(exact.reduce((best, row) => leadCount(row) > leadCount(best) ? row : best));
+    const ids = taxonomy.filter((row) => sectorLabel(row) === label).map((row) => row.id);
+    return { kind: "resolved", label, ids, exact: true };
+  }
+  const want = new Set(sectorTokens(text3));
+  const sameWords = taxonomy.filter((row) => {
+    const have = new Set(sectorTokens(sectorLabel(row)));
+    return have.size === want.size && [...want].every((token) => have.has(token));
+  });
+  const sameWordLabels = new Set(sameWords.map((row) => sectorLabel(row)).filter(Boolean));
+  if (sameWordLabels.size === 1) {
+    const label = [...sameWordLabels][0];
+    const ids = taxonomy.filter((row) => sectorLabel(row) === label).map((row) => row.id);
+    return { kind: "resolved", label, ids, exact: false };
+  }
+  const scored = [];
+  for (const row of taxonomy) {
+    const have = new Set(sectorTokens(sectorLabel(row)));
+    if (have.size === 0)
+      continue;
     let overlap = 0;
-    for (const t of want)
-      if (have.has(t))
+    for (const token of want)
+      if (have.has(token))
         overlap += 1;
-    const score = overlap / Math.max(want.size, 1);
-    return { id: s.id, name: s.name ?? "", score };
-  }).filter((m) => m.score > 0).sort((a, b) => b.score - a.score);
-  return ranked.slice(0, 5);
+    if (overlap === 0)
+      continue;
+    scored.push({ row, score: overlap / want.size, closeness: overlap / have.size });
+  }
+  const full = scored.filter((s) => s.score >= 1);
+  return {
+    kind: "unresolved",
+    candidates: full.length > 0 ? rankCandidates(full, "breadth") : rankCandidates(scored, "closeness").slice(0, MAX_PARTIAL_CANDIDATES)
+  };
+}
+function sectorSections(taxonomy) {
+  const roots = taxonomy.filter((row) => !row.parent);
+  const labels = [];
+  for (const row of roots.sort((a, b) => leadCount(b) - leadCount(a))) {
+    const label = sectorLabel(row);
+    if (label && !labels.includes(label))
+      labels.push(label);
+  }
+  return labels;
+}
+async function fetchSectorTaxonomy(client, ctx) {
+  const me = await client.resolveMe().catch(() => null);
+  const lang = me?.language ?? "en";
+  const taxonomy = await client.request("GET", `/sectors/all?lang=${encodeURIComponent(lang)}&includeInvisible=false`);
+  const unlabelled = taxonomy.filter((row) => !sectorLabel(row)).length;
+  if (unlabelled > 0) {
+    ctx?.logger?.warn?.(`sector taxonomy: ${unlabelled}/${taxonomy.length} row(s) carry no label`);
+  }
+  return taxonomy;
+}
+function resolveSectorValues(values, taxonomy) {
+  const out = {
+    values: [],
+    rewritten: [],
+    unresolved: [],
+    sections: sectorSections(taxonomy)
+  };
+  for (const raw of values) {
+    const asked = typeof raw === "string" ? raw : String(raw ?? "");
+    if (NUMERIC_ID.test(asked.trim())) {
+      out.values.push(asked.trim());
+      continue;
+    }
+    const match = matchSector(asked, taxonomy);
+    if (match.kind === "resolved") {
+      out.values.push(match.label);
+      if (match.label !== asked)
+        out.rewritten.push({ asked, used: match.label });
+      continue;
+    }
+    out.values.push(asked);
+    out.unresolved.push({ asked, closest: match.candidates });
+  }
+  return out;
 }
+var FILLER, MAX_CANDIDATES, MAX_PARTIAL_CANDIDATES, NUMERIC_ID;
+var init_sector_resolver = __esm({
+  "../core/dist/composite/_sector-resolver.js"() {
+    "use strict";
+    FILLER = /* @__PURE__ */ new Set([
+      // en
+      "and",
+      "of",
+      "the",
+      "for",
+      "or",
+      "activity",
+      // fr
+      "et",
+      "de",
+      "des",
+      "du",
+      "d",
+      "la",
+      "le",
+      "les",
+      "l",
+      "en",
+      "aux",
+      "au",
+      "activite",
+      "pour",
+      "sur",
+      "par",
+      "a"
+    ]);
+    MAX_CANDIDATES = 8;
+    MAX_PARTIAL_CANDIDATES = 4;
+    NUMERIC_ID = /^\d+$/;
+  }
+});
+
+// ../core/dist/composite/adjust-audience.js
 async function resolveSectors(client, texts, ctx) {
   const looksLikeId2 = (s) => /^\d+$/.test(s);
   const direct = texts.filter(looksLikeId2);
@@ -20796,18 +20978,18 @@ async function resolveSectors(client, texts, ctx) {
   const me = await client.resolveMe().catch(() => null);
   const lang = me?.language ?? "en";
   const taxonomy = await client.request("GET", `/sectors/all?lang=${encodeURIComponent(lang)}&includeInvisible=false`);
-  const nullNames = taxonomy.filter((s) => !s.name).length;
+  const nullNames = taxonomy.filter((s) => !sectorLabel(s)).length;
   if (nullNames > 0) {
     ctx?.logger?.warn?.(`adjust_audience: /sectors/all returned ${nullNames}/${taxonomy.length} sector(s) with a null/missing name`);
   }
   const resolved = [...direct];
   const ambiguities = [];
   for (const text3 of free) {
-    const matches = bestMatches(text3, taxonomy);
-    if (matches.length === 1 || matches.length >= 2 && matches[0].score >= 0.66 && matches[0].score - matches[1].score >= 0.34) {
-      resolved.push(matches[0].id);
+    const match = matchSector(text3, taxonomy);
+    if (match.kind === "resolved") {
+      resolved.push(...match.ids);
     } else {
-      ambiguities.push({ sector_text: text3, matches });
+      ambiguities.push({ sector_text: text3, matches: match.candidates });
     }
   }
   return { resolved, ambiguities };
@@ -20914,6 +21096,7 @@ var init_adjust_audience = __esm({
     "use strict";
     init_geo_helpers();
     init_country_guard();
+    init_sector_resolver();
     init_tool_descriptions_generated();
     adjustAudience = {
       name: "leadbay_adjust_audience",
@@ -22131,12 +22314,68 @@ function sortFilterLists(filters) {
   }
   return out;
 }
+function isSectorRejection(err) {
+  const e = err;
+  return !!e && e.code === "BAD_INPUT" && typeof e.message === "string" && e.message.includes("filters.sectors");
+}
+async function submitSearch(client, body, opts, ctx) {
+  try {
+    return {
+      ok: true,
+      data: await client.request("POST", "/mcp/search", body, opts),
+      rewritten: []
+    };
+  } catch (err) {
+    const asked = body.filters?.sectors;
+    if (!isSectorRejection(err) || !Array.isArray(asked) || asked.length === 0) {
+      throw err;
+    }
+    const taxonomy = await fetchSectorTaxonomy(client, ctx).catch(() => {
+      throw err;
+    });
+    const fix = resolveSectorValues(asked, taxonomy);
+    if (fix.unresolved.length === 0 && fix.rewritten.length === 0)
+      throw err;
+    if (fix.unresolved.length > 0)
+      return { ok: false, choice: sectorChoice(fix) };
+    const retried = { ...body, filters: { ...body.filters, sectors: fix.values } };
+    return {
+      ok: true,
+      data: await client.request("POST", "/mcp/search", retried, opts),
+      rewritten: fix.rewritten
+    };
+  }
+}
+function sectorNote(rewritten) {
+  if (rewritten.length === 0)
+    return void 0;
+  const pairs = rewritten.map((r) => `"${r.asked}" \u2192 "${r.used}"`).join(", ");
+  return {
+    sectors_note: `Leadbay's sector taxonomy spells these differently, so the search ran on ${pairs}. Tell the user which sector was searched.`,
+    sectors_used: rewritten
+  };
+}
+function sectorChoice(fix) {
+  const names = fix.unresolved.map((u) => `"${u.asked}"`).join(", ");
+  return {
+    mode: "needs_sector_choice",
+    submitted: false,
+    unresolved_sectors: fix.unresolved.map((u) => ({
+      asked: u.asked,
+      closest: u.closest.map((c) => c.name)
+    })),
+    sector_sections: fix.sections,
+    resolved_sectors: fix.rewritten,
+    hint: `No sector in this workspace's taxonomy is named ${names || "that"}. Nothing was submitted and nothing was spent. Re-call with a label copied character for character from \`closest\` or \`sector_sections\` (a section covers everything under it), or drop \`filters.sectors\` and put the wording in \`query\` / \`example_lead.description\` instead \u2014 the search then RANKS on it rather than fencing on it, which is usually what the user meant. \`leadbay_list_sectors\` returns the full taxonomy if none of these fit.`
+  };
+}
 var DEFAULT_WAIT_SECONDS, findNewLeads;
 var init_find_new_leads = __esm({
   "../core/dist/composite/find-new-leads.js"() {
     "use strict";
     init_mcp_job_helpers();
     init_country_guard();
+    init_sector_resolver();
     init_tool_descriptions_generated();
     DEFAULT_WAIT_SECONDS = 45;
     findNewLeads = {
@@ -22177,7 +22416,7 @@ var init_find_new_leads = __esm({
           },
           filters: {
             type: "object",
-            description: "HARD constraints (the seed only shapes ranking). Sector/location labels resolve at submit; an unresolvable value is a 400 naming it.",
+            description: "HARD constraints (the seed only shapes ranking). Sector/location labels resolve at submit. `sectors` must be a label from Leadbay's own taxonomy (leadbay_list_sectors) \u2014 everyday wording like 'Professional Services' is not one; a spelling/plural slip is corrected for you, but a word with no label comes back as mode:'needs_sector_choice' with the labels to pick from. An unresolvable location is a 400 naming it.",
             properties: {
               sectors: { type: "array", items: { type: "string" } },
               locations: { type: "array", items: { type: "string" } },
@@ -22349,19 +22588,27 @@ var init_find_new_leads = __esm({
           dry_run: dryRun
         });
         if (dryRun === true) {
-          const forecast = await client.request("POST", "/mcp/search", body);
+          const attempt2 = await submitSearch(client, body, void 0, ctx);
+          if (!attempt2.ok)
+            return { ...attempt2.choice, ...countryNote, region: client.region };
           return {
             dry_run: true,
-            ...forecast,
+            ...attempt2.data,
+            ...sectorNote(attempt2.rewritten),
             ...countryNote,
             region: client.region
           };
         }
         if (isPaid && !consented) {
-          const forecast = vetoed ? null : await client.request("POST", "/mcp/search", {
-            ...body,
-            dry_run: true
-          });
+          let forecast = null;
+          let quoteRewritten = [];
+          if (!vetoed) {
+            const attempt2 = await submitSearch(client, { ...body, dry_run: true }, void 0, ctx);
+            if (!attempt2.ok)
+              return { ...attempt2.choice, ...countryNote, region: client.region };
+            forecast = attempt2.data;
+            quoteRewritten = attempt2.rewritten;
+          }
           return {
             mode: "needs_confirmation",
             submitted: false,
@@ -22374,11 +22621,15 @@ var init_find_new_leads = __esm({
             estimated_cost: forecast?.estimated_cost ?? null,
             items_requested: forecast?.items_requested ?? null,
             hint: vetoed ? "confirm:false vetoed the run \u2014 nothing was submitted. Re-call with confirm:true to proceed, or drop qualify/channels for a free search." : "Tell the user what will run and that it uses their plan's quota (no amounts, no money), get an explicit go-ahead, then re-call with confirm:true. For a free search instead: omit qualify and channels.",
+            ...sectorNote(quoteRewritten),
             ...countryNote,
             region: client.region
           };
         }
-        const submit = await client.request("POST", "/mcp/search", body, { preSendSignal: ctx?.signal });
+        const attempt = await submitSearch(client, body, { preSendSignal: ctx?.signal }, ctx);
+        if (!attempt.ok)
+          return { ...attempt.choice, ...countryNote, region: client.region };
+        const submit = attempt.data;
         const mocked = mockedSubmitPreview(submit, "leadbay_find_new_leads", client.region);
         if (mocked)
           return mocked;
@@ -22429,6 +22680,7 @@ var init_find_new_leads = __esm({
             since: snapshot.next_since ?? null,
             suggested_wait_seconds: done ? 0 : 60
           },
+          ...sectorNote(attempt.rewritten),
           ...countryNote,
           region: client.region
         };
@@ -23977,8 +24229,8 @@ var init_report_outreach = __esm({
         if (!params.dry_run && params.verification.source === "user_confirmed" && typeof ctx?.elicit === "function") {
           try {
             const targetIds = params.lead_ids ?? [params.lead_id];
-            const leadCount = targetIds.length;
-            const elicitMsg = leadCount === 1 ? `An AI agent wants to log outreach on lead ${targetIds[0]}: "${params.note}". The agent claims you confirmed this. Type your literal confirmation to proceed; cancel to reject.` : `An AI agent wants to log outreach on ${leadCount} leads: "${params.note}". The agent claims you confirmed this. Type your literal confirmation to proceed; cancel to reject.`;
+            const leadCount2 = targetIds.length;
+            const elicitMsg = leadCount2 === 1 ? `An AI agent wants to log outreach on lead ${targetIds[0]}: "${params.note}". The agent claims you confirmed this. Type your literal confirmation to proceed; cancel to reject.` : `An AI agent wants to log outreach on ${leadCount2} leads: "${params.note}". The agent claims you confirmed this. Type your literal confirmation to proceed; cancel to reject.`;
             const result = await ctx.elicit({
               message: elicitMsg,
               requestedSchema: {
@@ -31336,7 +31588,7 @@ var OAUTH_BASE_URLS = {
     fr: "https://staging.api.leadbay.app"
   }
 };
-var VERSION = "0.39.1";
+var VERSION = "0.39.3";
 var HELP = `
 leadbay-mcp ${VERSION} \u2014 Leadbay Model Context Protocol server
 

package/dist/http-server.js

@@ -9679,7 +9679,7 @@ prose paragraph. Full recipe below.
 
 Build a single-call mixed-mode itinerary for a field sales tour. Combines \`leadbay_pull_followups\` (Monitor leads in the city \u2014 known accounts) with \`leadbay_pull_leads\` (Discover wishlist \u2014 new prospects, then client-side filtered by city) so the agent can answer the canonical #3630 US1 ask: *"I'm visiting Limoges in 4 days \u2014 propose 3 customers + 3 qualified prospects + 3 new high-potential discoveries."*
 
-**Geo resolution** is identical to \`leadbay_followups_map\`: pass \`city\` (any level from state down to neighborhood \u2014 state, *r\xE9gion*, county, city \u2014 the \`/geo/search\` resolver picks the best match), or a pre-resolved \`city_id\`. Ambiguous matches surface as \`status: "ambiguous_locations"\` + \`location_ambiguities[]\`; pick an id and re-call with \`city_id\`.
+**Geo resolution** is identical to \`leadbay_followups_map\`: pass \`city\` (any level from state down to neighborhood \u2014 state, *r\xE9gion*, county, city \u2014 the \`/geo/search\` resolver picks the best match), or a pre-resolved \`city_id\`. Ambiguous matches surface as \`status: "ambiguous_locations"\` + \`location_ambiguities[]\`; re-call with \`city_id\` set to the id you pick AND \`city\` set to that candidate's \`name\`. Both are needed: the id scopes the follow-ups, the name scopes the Discover leads, and with \`city_id\` alone \`discover_leads\` comes back empty.
 
 **One workspace = one country \u2014 a country name is NEVER a location filter.** The admin-area index holds no country nodes, so \`"France"\` matches the *commune of Francs* and \`"United States"\` matches *Statesboro*: the call is silently fenced to one village and every conclusion from it is wrong. City AND country named? Keep the city, drop the country.
 
@@ -9709,7 +9709,7 @@ not an itinerary. So for ANY country-level \`city\` \u2014 this workspace's own
 visiting and re-call with that. \`status: "country_level_location"\` carries the
 same instruction in its \`hint\`.
 
-**Counts**: \`followups_count\` (default 6 \u2014 generous so the agent can split into "customers + qualified" client-side) and \`discover_count\` (default 6 after client-side geo filter). The composite over-pulls Discover (30 raw) because the wishlist endpoint has no server-side geo filter \u2014 it then filters by \`location.city/state/country/full\` substring match against the requested city. The \`discover_filter_note\` string in the response tells the agent the match ratio so it can be honest about coverage ("matched 3/30 by city/state" vs. "matched 12/30").
+**Counts**: \`followups_count\` (default 6 \u2014 generous so the agent can split into "customers + qualified" client-side) and \`discover_count\` (default 6 after client-side geo filter). The composite over-pulls Discover (30 raw) because the wishlist endpoint has no server-side geo filter \u2014 it then keeps the leads whose own \`location.city\` names the requested city, and falls back to \`location.state\` only when no city matched (which is what a regional ask like "Texas" or "\xCEle-de-France" looks like). \`location.country\` is never consulted. \`discover_filter_note\` reports the ratio and which field carried it, so the agent can be honest about coverage. **When it says no Discover lead is in the city, say that** \u2014 return the Monitor half and offer \`leadbay_find_new_leads\` for that city. Never fill the gap with leads from elsewhere.
 
 **What \`tour_plan\` does NOT do**: it doesn't persist the tour as a campaign artifact. To do that \u2014 create a "Limoges Tour \u2013 May 24" campaign and attach the selected accounts \u2014 chain into \`leadbay_create_campaign({lead_ids: [...selected_ids], name: 'Limoges Tour \u2013 <date>'})\` after the user picks. See the \`leadbay_plan_tour_in_city\` prompt for the full end-to-end orchestrator.
 
@@ -16691,8 +16691,8 @@ function summarise(responses) {
   return { answered, total, avg_qualification_boost: avg, best_response_excerpt: excerpt };
 }
 function buildPullLeadsNextSteps(args) {
-  const { leadCount, hasMore, nextPage, computingWishlist, computingScores } = args;
-  if (leadCount <= 0) {
+  const { leadCount: leadCount2, hasMore, nextPage, computingWishlist, computingScores } = args;
+  if (leadCount2 <= 0) {
     if (computingWishlist || computingScores) {
       return {
         question: "This lens is still warming up. What next?",
@@ -16937,15 +16937,15 @@ var pullLeads = {
     const currentPage = res.pagination?.page ?? page;
     const hasMore = currentPage < totalPages - 1;
     const nextPage = hasMore ? currentPage + 1 : null;
-    const leadCount = res.items.length;
+    const leadCount2 = res.items.length;
     const nextSteps = buildPullLeadsNextSteps({
-      leadCount,
+      leadCount: leadCount2,
       hasMore,
       nextPage,
       computingWishlist: res.computing_wishlist,
       computingScores: res.computing_scores
     });
-    const lensIsEmpty = leadCount === 0 && (res.pagination?.total ?? 0) === 0;
+    const lensIsEmpty = leadCount2 === 0 && (res.pagination?.total ?? 0) === 0;
     const emptyReason = lensIsEmpty ? await diagnoseEmptyLens(client, lensId, {
       wishlist: res.computing_wishlist,
       scores: res.computing_scores
@@ -17373,13 +17373,34 @@ var followupsMap = {
 var DEFAULT_FOLLOWUPS_COUNT = 6;
 var DEFAULT_DISCOVER_COUNT = 6;
 var DISCOVER_OVER_PULL = 30;
-function cityMatches(lead, cityHint) {
-  if (!cityHint)
-    return true;
-  const hint = cityHint.toLowerCase();
-  const loc = lead?.location ?? {};
-  const haystacks = [loc.city, loc.state, loc.country, loc.full].filter((v) => typeof v === "string").map((v) => v.toLowerCase());
-  return haystacks.some((h) => h.includes(hint) || hint.includes(h));
+function normalizeGeo(value) {
+  return value.normalize("NFD").replace(/[\u0300-\u036f]/g, "").toLowerCase().replace(/[^a-z0-9]+/g, " ").trim();
+}
+var ADMIN_PREFIX = /^(?:city|town|village|borough|township|municipality) of /;
+function townName(value) {
+  return normalizeGeo(value).replace(ADMIN_PREFIX, "");
+}
+function cityHintCore(cityHint) {
+  const head = cityHint.split(",")[0] ?? "";
+  const expanded = expandAlias(head);
+  return { name: townName(expanded), isCity: expanded !== head };
+}
+function stateFieldOf(lead) {
+  const state = lead?.location?.state;
+  return typeof state === "string" ? normalizeGeo(state) : "";
+}
+function filterDiscoverByCity(leads, cityHint) {
+  const hint = cityHint ? cityHintCore(cityHint) : { name: "", isCity: false };
+  if (!hint.name)
+    return { leads, matchedOn: null };
+  const cityOf = (l) => typeof l?.location?.city === "string" ? townName(l.location.city) : "";
+  const byCity = leads.filter((l) => cityOf(l) === hint.name);
+  if (byCity.length > 0)
+    return { leads: byCity, matchedOn: "city" };
+  if (hint.isCity)
+    return { leads: [], matchedOn: "city" };
+  const byState = leads.filter((l) => stateFieldOf(l) === hint.name);
+  return { leads: byState, matchedOn: "state" };
 }
 function toMapLocation(lead, mode) {
   const pos = lead?.location?.pos;
@@ -17448,7 +17469,7 @@ var tourPlan = {
       },
       city_id: {
         type: "string",
-        description: "Pre-resolved admin_area id (numeric string). Bypasses the resolver."
+        description: "Pre-resolved admin_area id (numeric string). Bypasses the resolver. Pass `city` alongside it with the NAME of the area you picked: the id scopes the Monitor half, and the name is the only thing that can scope the Discover half, which has no server-side geo filter. With `city_id` alone, `discover_leads` comes back empty."
       },
       followups_count: {
         type: "number",
@@ -17555,7 +17576,13 @@ var tourPlan = {
     const discoverCount = params.discover_count ?? DEFAULT_DISCOVER_COUNT;
     const [followupsResult, leadsResult] = await Promise.allSettled([
       pullFollowups.execute(client, {
-        city: params.city,
+        // A pre-resolved id bypasses the resolver, which is what its own
+        // schema promises. Forwarding the free text alongside it sends the
+        // name back through /geo/search, and the name is the thing that was
+        // ambiguous — so an agent recovering from `ambiguous_locations` by
+        // picking an id would be handed the same ambiguity again. Here the
+        // free text stays behind and scopes the Discover half instead.
+        city: params.city_id ? void 0 : params.city,
         city_id: params.city_id,
         count: followupsCount
       }, ctx),
@@ -17569,7 +17596,7 @@ var tourPlan = {
           location_ambiguities: r.location_ambiguities,
           monitor_leads: [],
           discover_leads: [],
-          discover_filter_note: "City was ambiguous; pick an id and re-call to proceed.",
+          discover_filter_note: "City was ambiguous; re-call with `city_id` set to the id you pick AND `city` set to that candidate's `name`. The id scopes the follow-ups; the name is what scopes the Discover leads.",
           map_locations: [],
           map_summary: {
             total_leads: 0,
@@ -17593,13 +17620,27 @@ var tourPlan = {
     if (leadsResult.status === "rejected") {
       ctx?.logger?.warn?.(`tour_plan: pull_leads failed: ${leadsResult.reason?.message ?? leadsResult.reason}`);
     }
-    const filtered = rawDiscover.filter((l) => cityMatches(l, params.city));
+    const cityName = params.city && !/^\d+$/.test(params.city.trim()) ? params.city : void 0;
+    const knownId = params.city_id ?? (cityName ? void 0 : params.city);
+    const idOnly = Boolean(knownId) && !cityName;
+    const { leads: filtered, matchedOn } = idOnly ? { leads: [], matchedOn: null } : filterDiscoverByCity(rawDiscover, cityName);
     const discoverLeads2 = filtered.slice(0, discoverCount);
     const pulledLensId = leadsResult.status === "fulfilled" ? leadsResult.value?.lens?.id : null;
     if (pulledLensId != null) {
       reportLeadInteractions(client, pulledLensId, discoverLeads2.map((l) => l.id), ["LEAD_SEEN"], ctx?.logger);
     }
-    const filterNote = params.city ? `Matched ${filtered.length}/${rawDiscover.length} Discover leads to '${params.city}'; returning top ${discoverLeads2.length}.` : `No city filter applied; returning top ${discoverLeads2.length} Discover leads.`;
+    let filterNote;
+    if (idOnly) {
+      filterNote = `Discover leads need the NAME of the place, and this call passed an area id (${knownId}) and no name. Re-call with \`city\` set to the name of that area, keeping \`city_id\` so the Monitor half stays on the area you picked. The follow-ups below are already scoped to it.`;
+    } else if (!cityName) {
+      filterNote = `No city filter applied; returning top ${discoverLeads2.length} Discover leads.`;
+    } else if (matchedOn === null) {
+      filterNote = `No usable city filter in '${params.city}'; returning top ${discoverLeads2.length} Discover leads.`;
+    } else if (filtered.length === 0) {
+      filterNote = `No Discover lead in the active lens is in '${params.city}' (checked ${rawDiscover.length} candidates by city, then by state/region). Say so; do NOT present leads from elsewhere as if they were in '${params.city}'.`;
+    } else {
+      filterNote = `Matched ${filtered.length}/${rawDiscover.length} Discover leads to '${params.city}' by ${matchedOn === "city" ? "city" : "state/region"}; returning top ${discoverLeads2.length}.`;
+    }
     return {
       city: params.city ?? null,
       city_id: params.city_id ?? null,
@@ -22957,27 +22998,161 @@ var bulkEnrichStatus = {
   }
 };
 
-// ../core/dist/composite/adjust-audience.js
-function tokens(s) {
-  if (!s)
-    return [];
-  return s.toLowerCase().split(/[^\p{L}\p{N}]+/u).filter(Boolean);
+// ../core/dist/composite/_sector-resolver.js
+var FILLER = /* @__PURE__ */ new Set([
+  // en
+  "and",
+  "of",
+  "the",
+  "for",
+  "or",
+  "activity",
+  // fr
+  "et",
+  "de",
+  "des",
+  "du",
+  "d",
+  "la",
+  "le",
+  "les",
+  "l",
+  "en",
+  "aux",
+  "au",
+  "activite",
+  "pour",
+  "sur",
+  "par",
+  "a"
+]);
+function normalizeSectorText(value) {
+  return (value ?? "").normalize("NFD").replace(/[\u0300-\u036f]/g, "").toLowerCase().replace(/[^0-9a-z]+/g, " ").trim();
 }
-function bestMatches(text3, taxonomy) {
-  const want = new Set(tokens(text3));
-  if (want.size === 0)
-    return [];
-  const ranked = taxonomy.map((s) => {
-    const have = new Set(tokens(s.name));
+function singular(token) {
+  if (token.length > 4 && token.endsWith("ies"))
+    return `${token.slice(0, -3)}y`;
+  return token.length > 3 && token.endsWith("s") ? token.slice(0, -1) : token;
+}
+function sectorTokens(value) {
+  const all = normalizeSectorText(value).split(" ").filter(Boolean).map(singular);
+  const core = all.filter((t) => !FILLER.has(t));
+  return core.length > 0 ? core : all;
+}
+function sectorLabel(row) {
+  if (!row)
+    return "";
+  const label = row.label;
+  if (typeof label === "string" && label.length > 0)
+    return label;
+  return typeof row.name === "string" ? row.name : "";
+}
+function leadCount(row) {
+  const n = row.number_of_leads;
+  return typeof n === "number" && Number.isFinite(n) ? n : 0;
+}
+var MAX_CANDIDATES = 8;
+var MAX_PARTIAL_CANDIDATES = 4;
+function rankCandidates(scored, tieBreak) {
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  scored.sort((a, b) => b.score - a.score || (tieBreak === "breadth" ? leadCount(b.row) - leadCount(a.row) || b.closeness - a.closeness : b.closeness - a.closeness || leadCount(b.row) - leadCount(a.row)) || sectorLabel(a.row).length - sectorLabel(b.row).length).forEach(({ row, score }) => {
+    const label = sectorLabel(row);
+    if (!label || seen.has(label) || out.length >= MAX_CANDIDATES)
+      return;
+    seen.add(label);
+    out.push({ id: row.id, name: label, score: Number(score.toFixed(2)) });
+  });
+  return out;
+}
+function matchSector(text3, taxonomy) {
+  const wanted = normalizeSectorText(text3);
+  if (!wanted)
+    return { kind: "unresolved", candidates: [] };
+  const exact = taxonomy.filter((row) => normalizeSectorText(sectorLabel(row)) === wanted);
+  if (exact.length > 0) {
+    const label = sectorLabel(exact.reduce((best, row) => leadCount(row) > leadCount(best) ? row : best));
+    const ids = taxonomy.filter((row) => sectorLabel(row) === label).map((row) => row.id);
+    return { kind: "resolved", label, ids, exact: true };
+  }
+  const want = new Set(sectorTokens(text3));
+  const sameWords = taxonomy.filter((row) => {
+    const have = new Set(sectorTokens(sectorLabel(row)));
+    return have.size === want.size && [...want].every((token) => have.has(token));
+  });
+  const sameWordLabels = new Set(sameWords.map((row) => sectorLabel(row)).filter(Boolean));
+  if (sameWordLabels.size === 1) {
+    const label = [...sameWordLabels][0];
+    const ids = taxonomy.filter((row) => sectorLabel(row) === label).map((row) => row.id);
+    return { kind: "resolved", label, ids, exact: false };
+  }
+  const scored = [];
+  for (const row of taxonomy) {
+    const have = new Set(sectorTokens(sectorLabel(row)));
+    if (have.size === 0)
+      continue;
     let overlap = 0;
-    for (const t of want)
-      if (have.has(t))
+    for (const token of want)
+      if (have.has(token))
         overlap += 1;
-    const score = overlap / Math.max(want.size, 1);
-    return { id: s.id, name: s.name ?? "", score };
-  }).filter((m) => m.score > 0).sort((a, b) => b.score - a.score);
-  return ranked.slice(0, 5);
+    if (overlap === 0)
+      continue;
+    scored.push({ row, score: overlap / want.size, closeness: overlap / have.size });
+  }
+  const full = scored.filter((s) => s.score >= 1);
+  return {
+    kind: "unresolved",
+    candidates: full.length > 0 ? rankCandidates(full, "breadth") : rankCandidates(scored, "closeness").slice(0, MAX_PARTIAL_CANDIDATES)
+  };
+}
+function sectorSections(taxonomy) {
+  const roots = taxonomy.filter((row) => !row.parent);
+  const labels = [];
+  for (const row of roots.sort((a, b) => leadCount(b) - leadCount(a))) {
+    const label = sectorLabel(row);
+    if (label && !labels.includes(label))
+      labels.push(label);
+  }
+  return labels;
+}
+async function fetchSectorTaxonomy(client, ctx) {
+  const me = await client.resolveMe().catch(() => null);
+  const lang = me?.language ?? "en";
+  const taxonomy = await client.request("GET", `/sectors/all?lang=${encodeURIComponent(lang)}&includeInvisible=false`);
+  const unlabelled = taxonomy.filter((row) => !sectorLabel(row)).length;
+  if (unlabelled > 0) {
+    ctx?.logger?.warn?.(`sector taxonomy: ${unlabelled}/${taxonomy.length} row(s) carry no label`);
+  }
+  return taxonomy;
+}
+var NUMERIC_ID = /^\d+$/;
+function resolveSectorValues(values, taxonomy) {
+  const out = {
+    values: [],
+    rewritten: [],
+    unresolved: [],
+    sections: sectorSections(taxonomy)
+  };
+  for (const raw of values) {
+    const asked = typeof raw === "string" ? raw : String(raw ?? "");
+    if (NUMERIC_ID.test(asked.trim())) {
+      out.values.push(asked.trim());
+      continue;
+    }
+    const match = matchSector(asked, taxonomy);
+    if (match.kind === "resolved") {
+      out.values.push(match.label);
+      if (match.label !== asked)
+        out.rewritten.push({ asked, used: match.label });
+      continue;
+    }
+    out.values.push(asked);
+    out.unresolved.push({ asked, closest: match.candidates });
+  }
+  return out;
 }
+
+// ../core/dist/composite/adjust-audience.js
 async function resolveSectors(client, texts, ctx) {
   const looksLikeId2 = (s) => /^\d+$/.test(s);
   const direct = texts.filter(looksLikeId2);
@@ -22987,18 +23162,18 @@ async function resolveSectors(client, texts, ctx) {
   const me = await client.resolveMe().catch(() => null);
   const lang = me?.language ?? "en";
   const taxonomy = await client.request("GET", `/sectors/all?lang=${encodeURIComponent(lang)}&includeInvisible=false`);
-  const nullNames = taxonomy.filter((s) => !s.name).length;
+  const nullNames = taxonomy.filter((s) => !sectorLabel(s)).length;
   if (nullNames > 0) {
     ctx?.logger?.warn?.(`adjust_audience: /sectors/all returned ${nullNames}/${taxonomy.length} sector(s) with a null/missing name`);
   }
   const resolved = [...direct];
   const ambiguities = [];
   for (const text3 of free) {
-    const matches = bestMatches(text3, taxonomy);
-    if (matches.length === 1 || matches.length >= 2 && matches[0].score >= 0.66 && matches[0].score - matches[1].score >= 0.34) {
-      resolved.push(matches[0].id);
+    const match = matchSector(text3, taxonomy);
+    if (match.kind === "resolved") {
+      resolved.push(...match.ids);
     } else {
-      ambiguities.push({ sector_text: text3, matches });
+      ambiguities.push({ sector_text: text3, matches: match.candidates });
     }
   }
   return { resolved, ambiguities };
@@ -24293,6 +24468,61 @@ function sortFilterLists(filters) {
   }
   return out;
 }
+function isSectorRejection(err) {
+  const e = err;
+  return !!e && e.code === "BAD_INPUT" && typeof e.message === "string" && e.message.includes("filters.sectors");
+}
+async function submitSearch(client, body, opts, ctx) {
+  try {
+    return {
+      ok: true,
+      data: await client.request("POST", "/mcp/search", body, opts),
+      rewritten: []
+    };
+  } catch (err) {
+    const asked = body.filters?.sectors;
+    if (!isSectorRejection(err) || !Array.isArray(asked) || asked.length === 0) {
+      throw err;
+    }
+    const taxonomy = await fetchSectorTaxonomy(client, ctx).catch(() => {
+      throw err;
+    });
+    const fix = resolveSectorValues(asked, taxonomy);
+    if (fix.unresolved.length === 0 && fix.rewritten.length === 0)
+      throw err;
+    if (fix.unresolved.length > 0)
+      return { ok: false, choice: sectorChoice(fix) };
+    const retried = { ...body, filters: { ...body.filters, sectors: fix.values } };
+    return {
+      ok: true,
+      data: await client.request("POST", "/mcp/search", retried, opts),
+      rewritten: fix.rewritten
+    };
+  }
+}
+function sectorNote(rewritten) {
+  if (rewritten.length === 0)
+    return void 0;
+  const pairs = rewritten.map((r) => `"${r.asked}" \u2192 "${r.used}"`).join(", ");
+  return {
+    sectors_note: `Leadbay's sector taxonomy spells these differently, so the search ran on ${pairs}. Tell the user which sector was searched.`,
+    sectors_used: rewritten
+  };
+}
+function sectorChoice(fix) {
+  const names = fix.unresolved.map((u) => `"${u.asked}"`).join(", ");
+  return {
+    mode: "needs_sector_choice",
+    submitted: false,
+    unresolved_sectors: fix.unresolved.map((u) => ({
+      asked: u.asked,
+      closest: u.closest.map((c) => c.name)
+    })),
+    sector_sections: fix.sections,
+    resolved_sectors: fix.rewritten,
+    hint: `No sector in this workspace's taxonomy is named ${names || "that"}. Nothing was submitted and nothing was spent. Re-call with a label copied character for character from \`closest\` or \`sector_sections\` (a section covers everything under it), or drop \`filters.sectors\` and put the wording in \`query\` / \`example_lead.description\` instead \u2014 the search then RANKS on it rather than fencing on it, which is usually what the user meant. \`leadbay_list_sectors\` returns the full taxonomy if none of these fit.`
+  };
+}
 var findNewLeads = {
   name: "leadbay_find_new_leads",
   annotations: {
@@ -24331,7 +24561,7 @@ var findNewLeads = {
       },
       filters: {
         type: "object",
-        description: "HARD constraints (the seed only shapes ranking). Sector/location labels resolve at submit; an unresolvable value is a 400 naming it.",
+        description: "HARD constraints (the seed only shapes ranking). Sector/location labels resolve at submit. `sectors` must be a label from Leadbay's own taxonomy (leadbay_list_sectors) \u2014 everyday wording like 'Professional Services' is not one; a spelling/plural slip is corrected for you, but a word with no label comes back as mode:'needs_sector_choice' with the labels to pick from. An unresolvable location is a 400 naming it.",
         properties: {
           sectors: { type: "array", items: { type: "string" } },
           locations: { type: "array", items: { type: "string" } },
@@ -24503,19 +24733,27 @@ var findNewLeads = {
       dry_run: dryRun
     });
     if (dryRun === true) {
-      const forecast = await client.request("POST", "/mcp/search", body);
+      const attempt2 = await submitSearch(client, body, void 0, ctx);
+      if (!attempt2.ok)
+        return { ...attempt2.choice, ...countryNote, region: client.region };
       return {
         dry_run: true,
-        ...forecast,
+        ...attempt2.data,
+        ...sectorNote(attempt2.rewritten),
         ...countryNote,
         region: client.region
       };
     }
     if (isPaid && !consented) {
-      const forecast = vetoed ? null : await client.request("POST", "/mcp/search", {
-        ...body,
-        dry_run: true
-      });
+      let forecast = null;
+      let quoteRewritten = [];
+      if (!vetoed) {
+        const attempt2 = await submitSearch(client, { ...body, dry_run: true }, void 0, ctx);
+        if (!attempt2.ok)
+          return { ...attempt2.choice, ...countryNote, region: client.region };
+        forecast = attempt2.data;
+        quoteRewritten = attempt2.rewritten;
+      }
       return {
         mode: "needs_confirmation",
         submitted: false,
@@ -24528,11 +24766,15 @@ var findNewLeads = {
         estimated_cost: forecast?.estimated_cost ?? null,
         items_requested: forecast?.items_requested ?? null,
         hint: vetoed ? "confirm:false vetoed the run \u2014 nothing was submitted. Re-call with confirm:true to proceed, or drop qualify/channels for a free search." : "Tell the user what will run and that it uses their plan's quota (no amounts, no money), get an explicit go-ahead, then re-call with confirm:true. For a free search instead: omit qualify and channels.",
+        ...sectorNote(quoteRewritten),
         ...countryNote,
         region: client.region
       };
     }
-    const submit = await client.request("POST", "/mcp/search", body, { preSendSignal: ctx?.signal });
+    const attempt = await submitSearch(client, body, { preSendSignal: ctx?.signal }, ctx);
+    if (!attempt.ok)
+      return { ...attempt.choice, ...countryNote, region: client.region };
+    const submit = attempt.data;
     const mocked = mockedSubmitPreview(submit, "leadbay_find_new_leads", client.region);
     if (mocked)
       return mocked;
@@ -24583,6 +24825,7 @@ var findNewLeads = {
         since: snapshot.next_since ?? null,
         suggested_wait_seconds: done ? 0 : 60
       },
+      ...sectorNote(attempt.rewritten),
       ...countryNote,
       region: client.region
     };
@@ -26064,8 +26307,8 @@ var reportOutreach = {
     if (!params.dry_run && params.verification.source === "user_confirmed" && typeof ctx?.elicit === "function") {
       try {
         const targetIds = params.lead_ids ?? [params.lead_id];
-        const leadCount = targetIds.length;
-        const elicitMsg = leadCount === 1 ? `An AI agent wants to log outreach on lead ${targetIds[0]}: "${params.note}". The agent claims you confirmed this. Type your literal confirmation to proceed; cancel to reject.` : `An AI agent wants to log outreach on ${leadCount} leads: "${params.note}". The agent claims you confirmed this. Type your literal confirmation to proceed; cancel to reject.`;
+        const leadCount2 = targetIds.length;
+        const elicitMsg = leadCount2 === 1 ? `An AI agent wants to log outreach on lead ${targetIds[0]}: "${params.note}". The agent claims you confirmed this. Type your literal confirmation to proceed; cancel to reject.` : `An AI agent wants to log outreach on ${leadCount2} leads: "${params.note}". The agent claims you confirmed this. Type your literal confirmation to proceed; cancel to reject.`;
         const result = await ctx.elicit({
           message: elicitMsg,
           requestedSchema: {
@@ -28619,7 +28862,7 @@ function parseWriteEnv(env = process.env) {
 }
 
 // src/http-server.ts
-var VERSION = true ? "0.39.1" : "0.0.0-dev";
+var VERSION = true ? "0.39.3" : "0.0.0-dev";
 var PORT = Number(process.env.PORT ?? 8080);
 var HOST = process.env.HOST ?? "0.0.0.0";
 var logger = {

package/dist/installer-electron.js

@@ -1805,7 +1805,7 @@ var init_installer_gui = __esm({
     init_install_dxt();
     init_install_shared();
     init_oauth();
-    VERSION = true ? "0.39.1" : "0.0.0-dev";
+    VERSION = true ? "0.39.3" : "0.0.0-dev";
     MESSAGES = {
       en: {
         installer: {

package/dist/installer-gui.js

@@ -1068,7 +1068,7 @@ async function oauthLogin(opts) {
 }
 
 // installer/installer-gui.ts
-var VERSION = true ? "0.39.1" : "0.0.0-dev";
+var VERSION = true ? "0.39.3" : "0.0.0-dev";
 var MESSAGES = {
   en: {
     installer: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leadbay/mcp",
-  "version": "0.39.1",
+  "version": "0.39.3",
   "mcpName": "io.github.leadbay/leadbay-mcp",
   "description": "Model Context Protocol (MCP) server for Leadbay — AI lead discovery, qualification, and enrichment for Claude Desktop, Cursor, and Claude Code.",
   "type": "module",