@pipeworx/mcp-leadconnector 0.1.0 → 0.1.2

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2026 Pipeworx
+Copyright (c) 2026 Mojibake Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -2,12 +2,17 @@
 
 LeadConnector / GoHighLevel MCP Pack — wraps the GoHighLevel CRM for AI agents.
 
-Part of [Pipeworx](https://pipeworx.io) — an MCP gateway connecting AI agents to 250+ live data sources.
+Part of [Pipeworx](https://pipeworx.io) — an MCP gateway connecting AI agents to 1683+ live data sources.
 
 ## Tools
 
 | Tool | Description |
 |------|-------------|
+| `leadconnector_list_contacts` | Search or list CRM contacts in a GoHighLevel/LeadConnector account. Free-text query matches name, email, or phone. Returns a {contacts:[...], meta} envelope with contact IDs, names, emails, phones, tags, and custom fields. Requires your own GoHighLevel token via _apiKey (plus locationId for a v2 `pit-` token). |
+| `leadconnector_get_contact` | Fetch a single CRM contact by its contact ID. Returns full detail: name, email, phone, tags, source, custom fields, and timestamps. Requires your own GoHighLevel token via _apiKey (plus locationId for a v2 `pit-` token). |
+| `leadconnector_list_pipelines` | List all sales pipelines and their stages in the account. Returns a {pipelines:[...]} envelope with pipeline IDs, names, and ordered stages. Use the returned pipeline ID with leadconnector_list_opportunities. Requires your own GoHighLevel token via _apiKey (plus locationId for a v2 `pit-` token). |
+| `leadconnector_list_opportunities` | List opportunities (pipeline deals) for a given pipeline. Requires a pipelineId (get one from leadconnector_list_pipelines). Returns deals with monetary value, stage, status, and the associated contact. Requires your own GoHighLevel token via _apiKey (plus locationId for a v2 `pit-` token). |
+| `leadconnector_list_campaigns` | List marketing/automation campaigns in the account. Returns a {campaigns:[...]} envelope with campaign IDs, names, and status. Useful for finding a campaign to attribute or enroll contacts. Requires your own GoHighLevel token via _apiKey (plus locationId for a v2 `pit-` token). |
 
 ## Quick Start
 
@@ -23,7 +28,25 @@ Add to your MCP client (Claude Desktop, Cursor, Windsurf, etc.):
 }
 ```
 
-Or connect to the full Pipeworx gateway for access to all 250+ data sources:
+### What this endpoint actually serves
+
+`tools/list` at `https://gateway.pipeworx.io/leadconnector/mcp` returns the tools in the table
+above **plus the shared Pipeworx meta-tools** — `ask_pipeworx`,
+`discover_tools`, `search_within`, `remember`/`recall` and the rest of the
+gateway-wide set. So the tool count you see is larger than this table: a
+single-pack endpoint currently lists roughly 30 shared tools alongside the
+pack's own. The connection's `initialize` response states its exact scope, and
+is the authoritative answer for a given day.
+
+This is deliberate, not multiplexing by accident. The meta-tools are what let a
+scoped connection answer a question this pack does not cover — via
+`ask_pipeworx`, which routes across the whole catalog — without you adding a
+second MCP server. There is currently no way to mount a pack endpoint without
+them; if the extra schemas cost you more context than the routing is worth,
+connect to the full gateway once rather than to several pack endpoints.
+
+Or connect to the full Pipeworx gateway to get every pack's tools listed
+directly, instead of just this one's:
 
 ```json
 {
@@ -35,9 +58,44 @@ Or connect to the full Pipeworx gateway for access to all 250+ data sources:
 }
 ```
 
+Both URLs reach the same gateway and the same 1683+ data sources. The
+only difference is which pack's tools are listed **directly**; `ask_pipeworx`
+reaches all of them from either one.
+
+## No MCP client? Call it over HTTP
+
+This pack takes your own API key (`_apiKey`) — we don't front one for it, so there's no curl here that would run without it. Inspect any tool: `GET https://gateway.pipeworx.io/v1/tools/leadconnector_list_contacts`. Find one: `POST https://gateway.pipeworx.io/v1/tools/search_packs` with `{"query":"..."}`.
+
+## Standalone (no gateway account)
+
+This package also runs as a local stdio MCP server — no Pipeworx account, no
+gateway round-trip:
+
+```json
+{
+  "mcpServers": {
+    "leadconnector": {
+      "command": "npx",
+      "args": ["-y", "@pipeworx/mcp-leadconnector"]
+    }
+  }
+}
+```
+
+Or run it directly to confirm it starts:
+
+```bash
+npx -y @pipeworx/mcp-leadconnector
+```
+
+It speaks MCP over stdin/stdout and answers `initialize`/`tools/list`/`tools/call`
+for **only** this pack's tools — none of the shared meta-tools the gateway
+connection above adds. Same source, same tools, no ask_pipeworx routing.
+
 ## Using with ask_pipeworx
 
-Instead of calling tools directly, you can ask questions in plain English:
+Instead of calling tools directly, you can ask questions in plain English —
+this works on the pack endpoint above as well as on the full gateway:
 
 ```
 ask_pipeworx({ question: "your question about Leadconnector data" })
@@ -47,7 +105,7 @@ The gateway picks the right tool and fills the arguments automatically.
 
 ## More
 
-- [All tools and guides](https://github.com/pipeworx-io/examples)
+- [Docs and guides](https://pipeworx.io/docs)
 - [pipeworx.io](https://pipeworx.io)
 
 ## License

package/bin/cli.js

@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+//
+// Entry point for `npx @pipeworx/mcp-<slug>`.
+//
+// Packs ship as raw TypeScript (no build step — see publish-pack.sh for why:
+// tsx sidesteps every extensionless-import / bare-JSON-import edge case a
+// per-pack tsc build would have to solve one pack at a time). This file
+// registers tsx's ESM loader programmatically, then hands off to src/server.ts,
+// which wraps the pack's {tools, callTool} export in a stdio MCP server.
+//
+// Copied verbatim into every published pack repo by scripts/publish-pack.sh —
+// edit this file, not a per-pack copy.
+import { register } from 'tsx/esm/api';
+
+register();
+
+await import('../src/server.ts');

package/package.json

@@ -1,20 +1,32 @@
 {
   "name": "@pipeworx/mcp-leadconnector",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "LeadConnector / GoHighLevel MCP Pack — wraps the GoHighLevel CRM for AI agents.",
   "type": "module",
   "main": "src/index.ts",
   "types": "src/index.ts",
+  "bin": {
+    "mcp-leadconnector": "bin/cli.js"
+  },
   "keywords": ["mcp", "mcp-server", "model-context-protocol", "pipeworx", "leadconnector"],
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/pipeworx-io/mcp-leadconnector"
+    "url": "git+https://github.com/pipeworx-io/mcp-leadconnector.git"
   },
   "scripts": {
     "typecheck": "tsc --noEmit"
   },
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.30.0",
+    "tsx": "^4.19.0"
+  },
   "devDependencies": {
-    "typescript": "^5.7.0"
+    "typescript": "^5.9.3",
+    "@cloudflare/workers-types": "^4.20260405.1"
+  },
+  "pipeworx": {
+    "sourceHash": "v1-4c469db68ded0b08475a65067c35b6b71e482057b977a280d7d39d6edb483149",
+    "sourceCommit": "1064560fd9dcd0d6fc2606298c2ba244b3a1fbeb"
   }
 }

package/server.json

@@ -3,7 +3,7 @@
   "name": "io.github.pipeworx-io/leadconnector",
   "title": "Leadconnector",
   "description": "LeadConnector / GoHighLevel MCP Pack — wraps the GoHighLevel CRM for AI agents.",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "websiteUrl": "https://pipeworx.io/packs/leadconnector",
   "repository": {
     "url": "https://github.com/pipeworx-io/mcp-leadconnector",

package/src/index.ts

@@ -1,11 +1,19 @@
 interface McpToolDefinition {
   name: string;
   description: string;
+  /** Human-facing one-liner (fleet #1967). Optional; consumers fall back to
+   *  description. Kept in step with shared/src/types.ts — scripts/lib/
+   *  check-inlined-types.mjs reports drift at publish time. */
+  summary?: string;
   inputSchema: {
     type: 'object';
     properties: Record<string, unknown>;
     required?: string[];
+    anyOf?: Array<{ required: string[] }>;
+    oneOf?: Array<{ required: string[] }>;
+    allOf?: Array<{ required: string[] }>;
   };
+  outputSchema?: Record<string, unknown>;
 }
 
 interface McpToolExport {
@@ -16,15 +24,666 @@ interface McpToolExport {
   provider?: string;
 }
 
+/**
+ * Was this failure OUR OWN web service? — the other half of `internal-db-class.ts`.
+ *
+ * fleet #1089 pulled failures from our own Postgres out of `upstream_down` by
+ * keying on the SQLSTATE inside PostgREST's four-key error envelope. That
+ * covered the majority and structurally could not cover the rest: the rest
+ * never reach Postgres, so they carry no SQLSTATE. What was left, measured over
+ * the 24h to 2026-09-02T15:00Z (fleet #1096):
+ *
+ *     5  pipeworx-catalog  get_pack_tools     Pipeworx catalog error: 522 — error code: 522
+ *     3  fleet             fleet_list_open …  upstream_down: Fleet task queue did not respond within 25s
+ *
+ * 521/522/523/526 are Cloudflare saying its edge could not reach an ORIGIN, and
+ * in both of those rows the origin is ours — `gateway.pipeworx.io` for the
+ * catalog pack (it self-fetches when the gateway hasn't injected a manifest),
+ * our own Supabase for fleet. There is no third party anywhere in either call.
+ * Same defect as #1089: our own outage filed under `upstream_down`, the one
+ * class that means "the source is unreachable and there is nothing for us to
+ * fix", which is why the problem-tools triage skips it.
+ *
+ * WHY NOT A WORDING RULE. The obvious fix is to match `fleet db error:` and
+ * `Pipeworx catalog error:` in classifyToolError. Each is emitted from exactly
+ * one site today, so it would work today. It would also rot the first time
+ * somebody rewords a label — silently, and in the direction of hiding our own
+ * outage, which is worse than the bug being fixed. Every prose rule in
+ * error-class.ts has needed widening as packs invented new wording (#409/#450/
+ * #584); that history is most of that file's comment budget.
+ *
+ * WHAT THIS KEYS ON INSTEAD: **the host the call actually reached.** A URL's
+ * hostname is a fact about the call, not a guess about its prose. Two
+ * consequences that a pack-level flag could not give us, and the reason the
+ * flag was rejected:
+ *
+ *   - It describes the CALL, not the pack. `govcon-intel` fans out to our own
+ *     Supabase AND to genuine third parties; `court-listener` holds our cache
+ *     in Supabase and fetches courtlistener.com. An `internallyHosted: true` on
+ *     either pack would relabel a real third-party outage as ours — inventing
+ *     work, which is the same class of error in the opposite direction.
+ *   - It covers every future internal pack for free, instead of one declared
+ *     slug at a time.
+ *
+ * WHY IT SURVIVES A REWORD. The marker below is not matched as a literal by two
+ * separate files. `markInternalOrigin()` writes it and `internalHostMetricsClass()`
+ * reads it, both from the single exported `INTERNAL_ORIGIN_MARKER` constant in
+ * this module — so changing the wording changes both sides in the same edit and
+ * cannot desynchronise them. The pack's own label (`fleet db error:`,
+ * `Pipeworx catalog error:`) is not read at all: reword it freely, the class is
+ * unaffected. That is the property `stripClassPrefix` lacked when it drifted
+ * from its own classifier three times and needed a CI gate to hold them
+ * together.
+ *
+ * WHERE THE 5xx TEST LIVES. `markInternalOrigin` is called from the places that
+ * hold the real `Response` — `httpError`/`httpErrorMessage` and the timeout
+ * branch of `fetchWithTimeout` in `shared/src/http.ts` — so "is this an
+ * availability failure" is decided from the actual status code, never re-derived
+ * by scraping a number out of a sentence. A 404 from our own registry for a slug
+ * that does not exist is a caller's bad argument and is deliberately NOT marked.
+ */
+
+/**
+ * OUR OWN web service was unreachable — not an upstream, and never `upstream_down`.
+ *
+ * ONE value, not three, unlike `internal_db_*`. That split existed because a
+ * slow query, an exhausted pool and an unknown SQLSTATE have different owners
+ * and different fixes. Here there is only one story to tell — an origin we run
+ * did not answer the edge — and one owner. A bucket with no distinct owner per
+ * value is decoration; #724 is what happens when a class holds several
+ * situations, and inventing sub-values ahead of a reason to act on them
+ * differently is the same mistake with the sign flipped.
+ *
+ * METRICS ONLY, exactly like PLATFORM_KEY_ERROR_CLASS and the internal_db
+ * values. `classifyToolError` still answers `upstream_down` for the retry and
+ * hint paths, which only care whether retrying or a sibling tool might work —
+ * and it might. Nothing a caller sees or is charged changes here.
+ *
+ * READ SIDE: this value is in BROKEN_TOOL_CLASSES, FAULT_CLASSES and
+ * ALL_ERROR_CLASSES in `workers/registry-api/src/index.ts`. All three, or it
+ * lands on no dashboard — fleet #721 is the warning, where the #719 split
+ * worked on the write side and was invisible for weeks.
+ */
+const INTERNAL_SERVICE_UNREACHABLE_CLASS = 'internal_service_unreachable';
+
+/**
+ * The token that carries "this origin is ours" from the call site to the
+ * classifier.
+ *
+ * Appended to the error message rather than attached to the Error object,
+ * because the object does not survive the trip: 275 packs return `{ error:
+ * string }` instead of throwing, the gateway reads `observedError` as a string,
+ * and the fleet pack rebuilds its error from a captured status + body across a
+ * retry loop. A property on an Error would be dropped by every one of those
+ * paths and the class would work in tests and vanish in production.
+ *
+ * WORDING IS LOAD-BEARING, same rule as labelAge's note in authority.ts. This
+ * string is appended to a pack's thrown Error message (shared/src/http.ts),
+ * and a thrown Error's message is exactly what the gateway hands back to the
+ * caller as `content[0].text` when nothing rewrites it (workers/gateway/src
+ * catches the throw and sets `rawResult.message = stripClassPrefix(error)`,
+ * which does not touch this suffix) — so the original wording,
+ * " [pipeworx-hosted origin — our own service, not a third party]", was not a
+ * theoretical leak: it shipped live on pipeworx-catalog's 522s, 7 times in 6
+ * hours on 2026-09-02 (see tests/golden-internal-service.test.ts), verbatim
+ * naming Pipeworx as the host. check:hosting-claims never caught it because it
+ * did not scan shared/ at all (task #2009). Reworded to describe the
+ * OBSERVATION (the origin did not answer) without a claim about who runs it —
+ * the identical fix labelAge got: drop the possessive, keep the fact.
+ */
+const INTERNAL_ORIGIN_MARKER = ' [origin did not respond — retry before concluding the named source is down]';
+
+/**
+ * Supabase's data plane for a project is `<ref>.supabase.co`, where the ref is
+ * exactly twenty lowercase letters (ours is `pqauisounztsgdgfkhke`).
+ *
+ * Matching the shape rather than listing the ref keeps this correct when we add
+ * a project — `supabaseEnv` on a pack entry already points some packs at a
+ * second one — while still excluding `status.supabase.co`, which is Supabase's
+ * own status page and emphatically not our database. Verified 2026-09-02 by
+ * `grep -rhoE '[a-z0-9-]+\.supabase\.(co|in)' mcps shared workers scripts`: the
+ * only real project ref anywhere in the tree is ours, the rest are doc
+ * placeholders (`abc`, `xyz`, `example`) which this pattern also excludes. Same
+ * finding internal-db-class.ts relies on for the PostgREST envelope being ours
+ * by construction.
+ */
+const SUPABASE_PROJECT_HOST = /^[a-z]{20}\.supabase\.(co|in)$/;
+
+/**
+ * Is this a host WE run?
+ *
+ * Deliberately NOT including `*.workers.dev`: plenty of third-party APIs are
+ * hosted on workers.dev, so the suffix says where something runs and not who
+ * owns it. Every internal call we actually make goes to a `pipeworx.io`
+ * hostname or to our Supabase project, both of which are ownership facts.
+ *
+ * `workers/gateway/src/provenance.ts`'s `OUR_HOSTS` answers the same
+ * question and DOES include `workers.dev` — a documented divergence
+ * (task #2051), not a bug to converge. That list decides what a response may
+ * cite as a data SOURCE, where a false negative (citing our own worker as an
+ * external source) is the hosting-disclosure leak this whole file exists to
+ * prevent, so it errs broad. This one decides who gets BLAMED for a 5xx in
+ * outage metrics read by on-call, where a false positive (crediting our own
+ * infra with a third party's outage) hides the real failure, so it errs
+ * narrow. Same suffix, opposite direction, because they are never called for
+ * the same reason.
+ *
+ * Returns false on anything unparseable rather than throwing — this runs inside
+ * an error path, and an error path that can itself throw turns a diagnosable
+ * failure into a mystery.
+ */
+function isPipeworxOrigin(url: string | URL | undefined | null): boolean {
+  if (!url) return false;
+  let host: string;
+  try {
+    host = new URL(url instanceof URL ? url.href : url).hostname.toLowerCase();
+  } catch {
+    return false;
+  }
+  if (host === 'pipeworx.io' || host.endsWith('.pipeworx.io')) return true;
+  return SUPABASE_PROJECT_HOST.test(host);
+}
+
+/**
+ * Append the marker when this failure was OUR origin failing to answer.
+ *
+ * `status` is the HTTP status when there is one, and omitted for a timeout —
+ * where there is no response at all, and "the origin did not answer" is the
+ * whole observation. Statuses below 500 are left alone: a 404 from our own
+ * registry for a slug that does not exist is the caller's argument, not our
+ * outage, and marking it would put ordinary 404s on the incident dashboard.
+ *
+ * Idempotent, so a message that is wrapped and re-marked on the way up (the
+ * fleet pack's retry loop re-throws through two layers) carries the marker once.
+ */
+function markInternalOrigin(
+  message: string,
+  url: string | URL | undefined | null,
+  status?: number,
+): string {
+  if (status !== undefined && status < 500) return message;
+  if (!isPipeworxOrigin(url)) return message;
+  if (message.includes(INTERNAL_ORIGIN_MARKER)) return message;
+  return message + INTERNAL_ORIGIN_MARKER;
+}
+
+/**
+ * Which blob4 value a failure from our own web services books as, or undefined
+ * if this is not one.
+ *
+ * Ordered AFTER `internalDbMetricsClass` at the call site: a PostgREST envelope
+ * from our own Supabase is a strictly more specific statement about the same
+ * row (which of our services, and why), and the two cannot disagree about
+ * whether the failure is ours.
+ */
+function internalHostMetricsClass(error: string): string | undefined {
+  return error.includes(INTERNAL_ORIGIN_MARKER) ? INTERNAL_SERVICE_UNREACHABLE_CLASS : undefined;
+}
+
+
+/**
+ * One place to turn a failed `fetch` into an error a caller can act on.
+ *
+ * Nearly every pack was written the same way:
+ *
+ *     if (!res.ok) throw new Error(`Unsplash: ${res.status}`);
+ *
+ * which discards the response body — and the body is usually where the upstream
+ * says what was actually wrong ("**symbol** not found: GBP", "parameter `year`
+ * out of range", "unknown taxonomy id"). The caller gets a number, cannot
+ * self-correct, and retries the same broken call. A 2026-07-31 sweep found this
+ * shape in 481 of 1,400 packs, 47 of them PLATFORM-keyed.
+ *
+ * It also hides bugs one level down. Two of the first three packs audited had a
+ * second defect that only existed because of this line: unsplash's rate-limit
+ * branch sat BELOW a catch-all and was unreachable, and bea-gov parsed
+ * `BEAAPI.Error.APIErrorDescription` below a `!res.ok` throw that made the
+ * parsing dead code for every non-200.
+ *
+ * DELIBERATELY NOT A CLASSIFIER. It does not add `user_error:` /
+ * `upstream_down:` prefixes. Those decide which tier a failure lands in, and the
+ * `error` tier is what the daily problem-tools list is built from — it means
+ * "Pipeworx has a defect". A 400 is genuinely ambiguous: often a caller's bad
+ * argument, but sometimes a query WE built wrong (ted-eu comma-joined its CPV
+ * values into something TED rejected, and that bug was found only because it sat
+ * in `error`). Blanket-classifying 400s as caller mistakes would have hidden it.
+ * A pack that KNOWS which it is should keep saying so explicitly; this helper is
+ * for the 481 that say nothing at all.
+ */
+
+/** Longest upstream explanation we'll pass through. Enough for a real message,
+ *  short enough that an HTML page or a stack trace can't swamp the error. */
+
+const MAX_DETAIL = 300;
+
+/**
+ * Default bound for `fetchWithTimeout` when a pack doesn't state its own.
+ *
+ * 25s mirrors the number `epo-ops` landed on after measuring the real failure:
+ * a degraded upstream that doesn't error, it just never answers, and a Worker
+ * sits in `await fetch()` until ITS OWN execution budget kills the request —
+ * which can take minutes, not seconds (epo_ops_search_patents measured 4-8
+ * MINUTE hangs before this existed). 25s is short enough that a caller gets a
+ * fast, actionable error instead of holding the connection, and long enough
+ * that it doesn't false-trip on a merely-slow-but-alive upstream.
+ */
+const DEFAULT_FETCH_TIMEOUT_MS = 25_000;
+
+/**
+ * Read the body of a failed response and fold it into a throwable Error.
+ *
+ * Usage — note the `await`, which is the one thing that makes this a mechanical
+ * change rather than a drop-in:
+ *
+ *     if (!res.ok) throw await httpError(res, 'Unsplash');
+ *
+ * Safe to call on any non-ok response: a body that is missing, empty, unreadable
+ * or HTML degrades to exactly the old `Name: 404` string rather than throwing
+ * something new from inside the error path.
+ */
+async function httpError(res: Response, name: string): Promise<Error> {
+  return new Error(await httpErrorMessage(res, name));
+}
+
+/** The message text without constructing an Error — for packs that need to wrap
+ *  it in their own envelope or add an explicit classification prefix. */
+async function httpErrorMessage(res: Response, name: string): Promise<string> {
+  // The one place a 5xx from a host WE run gets stamped as ours. `res.url` is
+  // the URL the fetch actually resolved to (after redirects), so this is a fact
+  // about the call rather than a guess from the `name` the pack passed in —
+  // reword that label freely, the class does not move. See
+  // internal-host-class.ts; no-op for every third-party upstream, which is why
+  // this touches 481 packs' error text and changes none of it.
+  return markInternalOrigin(
+    `${name}: ${res.status}${detailSuffix(await readDetail(res))}`,
+    res.url,
+    res.status,
+  );
+}
+
+/**
+ * Just the upstream's own explanation — no name, no status.
+ *
+ * For a pack that has already said both in its own sentence. epo-ops reads
+ * `EPO rejected this search as too large (HTTP 413) — ${httpErrorMessage(…)}`,
+ * which rendered as `… (HTTP 413) — EPO: 413.` once the XML detail was being
+ * dropped: the upstream named twice, the status twice, and the one thing EPO
+ * actually said ("Not enough characters before truncation character") nowhere
+ * (fleet #712). Returns '' when the body carries nothing readable, so a caller
+ * can fall back to its own wording.
+ */
+async function upstreamDetail(res: Response): Promise<string> {
+  return readDetail(res);
+}
+
+/**
+ * Read a SUCCESSFUL response as JSON, failing loudly when it isn't JSON.
+ *
+ * `httpError` above only ever runs on `!res.ok`, which leaves the nastier half
+ * of the problem unhandled: an upstream that answers **HTTP 200 with an HTML
+ * page**. A bot wall, a login redirect, a maintenance interstitial and a CDN
+ * error page are all 200s, so `res.ok` is true, and `res.json()` then throws
+ * `Unexpected token '<', "<!DOCTYPE "... is not valid JSON`.
+ *
+ * That string is the problem. It names no upstream, carries no status, and
+ * reads like a parser bug in Pipeworx — so it lands in the `error` tier, which
+ * means "we have a defect", and the caller is told nothing they can act on.
+ * data.govt.nz sat dead behind an Imperva challenge this way and every
+ * status-code health check we own reported it green (7889a845). A zero-length
+ * body has the same shape: `Unexpected end of JSON input`, seen this week on
+ * uk-gazette (83% of external calls) and census.
+ *
+ * UNLIKE `httpError`, this one DOES classify, and the asymmetry is deliberate.
+ * A 400 is genuinely ambiguous — often the caller's bad argument, sometimes a
+ * query we built wrong — so blanket-classifying it would hide our own bugs.
+ * There is no such ambiguity here: **no argument a caller can pass makes a JSON
+ * API return an HTML page.** It is always the upstream, so `upstream_down:` is
+ * a statement of fact rather than a guess, and it keeps these out of the
+ * problem-tools list where they crowd out real defects.
+ *
+ *     const data = await parseJson<Feed>(res, 'UK Gazette');
+ *
+ * Call it only after the `!res.ok` check — on a failed response you want
+ * `httpError`, which mines the body for the upstream's own explanation.
+ */
+async function parseJson<T>(res: Response, name: string): Promise<T> {
+  let raw: string;
+  try {
+    raw = await res.text();
+  } catch {
+    throw new Error(
+      `upstream_down: ${name} returned a body that could not be read (HTTP ${res.status}). ` +
+        'The connection most likely dropped mid-response; retrying is reasonable.',
+    );
+  }
+
+  const type = res.headers.get('content-type') ?? 'no content-type';
+
+  if (!raw.trim()) {
+    throw new Error(
+      `upstream_down: ${name} answered HTTP ${res.status} with an EMPTY body where JSON was expected (${type}). ` +
+        'Nothing about the request can cause this — it is an upstream fault, and the same call may well work on retry.',
+    );
+  }
+
+  // Checked before parsing rather than in the catch, because knowing it is
+  // markup is what turns "we failed to parse something" into "they served a
+  // web page" — the second is diagnosable, the first is not.
+  const head = raw.slice(0, 200).trimStart().toLowerCase();
+  if (head.startsWith('<!doctype') || head.startsWith('<html') || head.startsWith('<?xml')) {
+    const kind = head.startsWith('<?xml') ? 'an XML document' : 'an HTML page';
+    // The summary, not the source. Pasting the first 120 characters of a web
+    // page handed the agent `<!DOCTYPE html><html lang="en"…` — the same leak
+    // this branch exists to describe (fleet #712).
+    throw new Error(
+      `upstream_down: ${name} answered HTTP ${res.status} with ${kind} instead of JSON (${type}). ` +
+        'That is typically a bot wall, a login redirect or a maintenance page — it is returned as a SUCCESS, ' +
+        `so status-code health checks read it as fine. No argument change will get past it. ` +
+        `The page says: ${summarizeErrorBody(raw) || 'nothing readable'}`,
+    );
+  }
+
+  try {
+    return JSON.parse(raw) as T;
+  } catch {
+    throw new Error(
+      `upstream_down: ${name} answered HTTP ${res.status} with a body that is not valid JSON (${type}). ` +
+        `It begins: ${stripMarkup(raw).slice(0, 120) || '(unreadable)'}`,
+    );
+  }
+}
+
+/**
+ * `fetch`, but bounded — the fix for a systemic gap found 2026-08-30: a grep
+ * audit of every pack's `mcps/*\/src/index.ts` found 1,339 of ~1,500 call
+ * `fetch()` with NO timeout guard anywhere in the file. Two of those
+ * (epo-ops, statcan) were confirmed live-hanging for 4-8 minutes before this
+ * existed — every unguarded call carries the same risk, just unconfirmed.
+ *
+ * Mirrors the `epoFetch` wrapper `mcps/epo-ops/src/index.ts` shipped first:
+ * bound the request with `AbortSignal.timeout`, and on a timeout/abort throw
+ * an `upstream_down:` error that names the upstream and the bound rather than
+ * letting the raw `TimeoutError`/`AbortError` (which names neither) propagate.
+ * `upstream_down:` is deliberate, same reasoning as `parseJson` above — no
+ * argument a caller passes can make an upstream hang, so it is always the
+ * upstream's fault, and marking it that way keeps a slow API off the
+ * problem-tools list where it would crowd out our own defects.
+ *
+ * Usage — a mechanical swap for a bare `fetch(url, init)`:
+ *
+ *     const res = await fetchWithTimeout(url, init, 'Some API');
+ *
+ * Pass `timeoutMs` as a fourth argument to override the default for a pack
+ * with a known-slower upstream; the label should be the same short name you'd
+ * pass to `httpError`/`httpErrorMessage` for that call.
+ */
+async function fetchWithTimeout(
+  url: string | URL,
+  init: RequestInit = {},
+  name: string,
+  timeoutMs: number = DEFAULT_FETCH_TIMEOUT_MS,
+): Promise<Response> {
+  try {
+    return await fetch(url, { ...init, signal: AbortSignal.timeout(timeoutMs) });
+  } catch (err) {
+    if (err instanceof Error && (err.name === 'TimeoutError' || err.name === 'AbortError')) {
+      // States the OBSERVATION (no response in N seconds), not a diagnosis.
+      // "appears to be degraded" is an inference about the vendor that we have
+      // not checked, and it is wrong in a way that misdirects whoever reads it:
+      // a timeout from a Worker can equally mean OUR egress is blocked.
+      //
+      // Measured today (2026-09-01, fleet #1047): every call to
+      // mainnet.base.org failed from the x402 facilitator while the identical
+      // request from a laptop returned 200. Base was entirely healthy; the
+      // public RPC refuses Cloudflare Worker egress. Had this message fired
+      // there it would have blamed Base by name, and the next person would have
+      // waited for a vendor outage to clear that did not exist.
+      // A timeout has no status to test — there is no response at all — so
+      // `markInternalOrigin` is called without one: an origin we run that never
+      // answered is an availability failure by definition. This is the half of
+      // fleet #1096 with neither a SQLSTATE nor a status code to key on.
+      throw new Error(
+        markInternalOrigin(
+          `upstream_down: ${name} did not respond within ${timeoutMs / 1000}s. ` +
+            `That can be ${name} being slow or down, or this environment being unable to reach it ` +
+            `(some hosts refuse datacenter/Worker egress) — retry shortly, and check reachability ` +
+            `from elsewhere before concluding ${name} is down.`,
+          url,
+        ),
+      );
+    }
+    // Fleet #2382. Everything that isn't a timeout/abort here is a genuine
+    // NETWORK-LEVEL failure — DNS resolution, connection refused, TLS handshake,
+    // Cloudflare's own "Network connection lost." — meaning `fetch()` itself
+    // threw and no HTTP response of any kind was ever received. Until this fix
+    // that raw exception was rethrown VERBATIM: a bare `TypeError: fetch failed`
+    // (or the Workers-runtime equivalent) names no upstream, carries no class
+    // token, and reads exactly like a defect in OUR code — because it says
+    // nothing about the call at all. It landed in `error`, the tier that means
+    // "Pipeworx has a defect", for every one of the (at the time of writing)
+    // ~470 packs that call this helper directly with no wrapper of their own.
+    //
+    // `dexscreener` hit this independently (fleet #1579) and fixed it with a
+    // bespoke per-pack try/catch around `fetchWithTimeout`. That fix is correct
+    // but only covers one pack; every other caller of this shared helper still
+    // leaked the raw exception. Moving the same fix HERE — the one place that
+    // already carries the timeout case — covers every pack that uses
+    // `fetchWithTimeout` without a wrapper, for free, and without widening
+    // `classifyToolError`'s regex list: the fix is giving the message a proper
+    // `upstream_down:` token at the point the two facts (no response was ever
+    // received, and which host we were trying to reach) are actually in hand,
+    // not teaching the classifier to guess from prose after the fact.
+    //
+    // Safe on the same grounds as the timeout branch above: no argument a
+    // caller passes can make `fetch()` itself throw a connection-level error,
+    // so this is always an availability failure, never a caller mistake. Same
+    // `markInternalOrigin` treatment — an origin we run that never answered is
+    // still ours, not a third party's outage.
+    const raw = err instanceof Error ? err.message : String(err);
+    throw new Error(
+      markInternalOrigin(
+        `upstream_down: could not reach ${name} at all (${raw.slice(0, 160)}). ` +
+          `No request reached ${name}, so this says NOTHING about whether the arguments you passed ` +
+          'are valid — do not re-check them on the strength of this error. Retry shortly.',
+        url,
+      ),
+    );
+  }
+}
+
+function detailSuffix(detail: string): string {
+  return detail ? ` — ${detail}` : '';
+}
+
+async function readDetail(res: Response): Promise<string> {
+  let raw: string;
+  try {
+    raw = await res.text();
+  } catch {
+    // Body already consumed, or the connection died mid-read. The status alone
+    // is still worth throwing — never let the error path throw its own error.
+    return '';
+  }
+  return summarizeErrorBody(raw);
+}
+
+/**
+ * Turn ANY error body — JSON, HTML, XML or plain text — into one short phrase
+ * that never contains markup.
+ *
+ * This used to just drop an HTML or XML body on the floor, on the reasoning
+ * that markup crowds out the status. That was half right. Dropping it loses the
+ * one sentence a caller could have acted on: an `Access Denied` title, an SDMX
+ * `<message:Error>` text, an OPS fault string. A 2026-08-30 support sweep
+ * measured 13 of 291 caller-facing error rows carrying a raw page or document
+ * verbatim, across 11 packs, and in every one of them the useful content —
+ * "Access Denied", "Invalid country code", "SCRAPE_TIMEOUT" — was in there,
+ * buried in markup the agent had to parse out of a string (fleet #712).
+ *
+ * So: extract the meaning, discard the markup. The output is passed through
+ * `stripMarkup` unconditionally, which is what lets `check:error-body-leak`
+ * assert mechanically that no caller-facing message can contain `<?xml`,
+ * `<!DOCTYPE` or `<html`.
+ */
+function summarizeErrorBody(raw: string): string {
+  if (!raw || !raw.trim()) return '';
+
+  const head = raw.slice(0, 400).trimStart().toLowerCase();
+
+  // An HTML error page (Cloudflare interstitial, nginx default, a login
+  // redirect) says what it is in its <title>, and almost nowhere else.
+  if (head.startsWith('<!doctype') || head.startsWith('<html')) {
+    const title = htmlTitle(raw);
+    return title
+      ? `${title} (upstream returned an HTML error page, not an API response)`
+      : 'upstream returned an HTML error page, not an API response';
+  }
+
+  // XML fault documents — EPO OPS, SDMX (`<message:Error>`), SOAP faults. The
+  // human sentence sits in a child element whose tag name says what it is.
+  if (head.startsWith('<?xml') || head.startsWith('<')) {
+    const fault = xmlFaultText(raw);
+    return fault
+      ? `${stripMarkup(fault).slice(0, MAX_DETAIL)} (from the upstream's XML error document)`
+      : 'upstream returned an XML error document with no readable message';
+  }
+
+  // Most JSON error bodies bury one human sentence among ids and echoed request
+  // params. Prefer that sentence; fall back to the whole body when the shape is
+  // unfamiliar, since an unfamiliar shape is exactly when we can least afford to
+  // guess wrong and show nothing.
+  const fromJson = messageFromJson(raw);
+  return stripMarkup(fromJson ?? raw).slice(0, MAX_DETAIL);
+}
+
+/** The `<title>` of an HTML error page, or its first `<h1>` — the two places a
+ *  bot wall, a 502 and an "Access Denied" all state what happened. */
+function htmlTitle(raw: string): string | null {
+  const head = raw.slice(0, 4000);
+  for (const re of [/<title[^>]*>([\s\S]*?)<\/title>/i, /<h1[^>]*>([\s\S]*?)<\/h1>/i]) {
+    const m = re.exec(head);
+    const text = m ? stripMarkup(m[1]) : '';
+    if (text) return text.slice(0, 160);
+  }
+  return null;
+}
+
+/** Tag names that carry the explanation in an XML fault document, namespace
+ *  prefix optional (`<message:Error>`, `<com:Text>`, `<faultstring>`). */
+const XML_FAULT_TAG_RE =
+  /<(?:[A-Za-z0-9_.-]+:)?(?:text|message|description|faultstring|reason|detail|title|errormessage|error)\b[^>]*>([^<]{2,400})</i;
+
+function xmlFaultText(raw: string): string | null {
+  const head = raw.slice(0, 8000);
+  const tagged = XML_FAULT_TAG_RE.exec(head);
+  if (tagged && tagged[1].trim()) return tagged[1];
+
+  // Nothing conventionally named — take the longest text node instead. A fault
+  // document with one sentence in an oddly named element is still readable;
+  // returning nothing at all is not.
+  let best = '';
+  for (const m of head.matchAll(/>([^<>]{8,400})</g)) {
+    const text = m[1].trim();
+    if (text.length > best.length) best = text;
+  }
+  return best || null;
+}
+
+/**
+ * Remove every tag and stray angle bracket, then collapse whitespace.
+ *
+ * Applied to everything on the way out, including the JSON and plain-text
+ * paths, because an upstream is free to embed markup in a JSON string field —
+ * and a leak is a leak regardless of which branch produced it.
+ */
+function stripMarkup(s: string): string {
+  return collapse(decodeEntities(s.replace(/<[^>]*>/g, ' ')).replace(/[<>]/g, ' '));
+}
+
+/** The handful of entities that show up in error-page titles. Decoded AFTER
+ *  tags are stripped and BEFORE the angle-bracket sweep, so `&lt;script&gt;`
+ *  in a title cannot decode into markup that survives — EMBL-EBI's ChEMBL 500
+ *  page renders as `500 Internal Server Error &lt; EMBL-EBI` otherwise. */
+function decodeEntities(s: string): string {
+  return s
+    .replace(/&(?:amp|#0*38);/gi, '&')
+    .replace(/&(?:lt|#0*60);/gi, '<')
+    .replace(/&(?:gt|#0*62);/gi, '>')
+    .replace(/&(?:quot|#0*34);/gi, '"')
+    .replace(/&(?:#0*39|apos|#x0*27);/gi, "'")
+    .replace(/&nbsp;/gi, ' ');
+}
+
+/** The conventional "what went wrong" field, under any of the names upstreams
+ *  actually use. Checked in order; first non-empty string wins. */
+const MESSAGE_KEYS = [
+  'message', 'error_message', 'errorMessage', 'detail', 'details',
+  'description', 'error_description', 'reason', 'title', 'fault',
+];
+
+function messageFromJson(raw: string): string | null {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return null;
+  }
+  return pickMessage(parsed, 0);
+}
+
+function pickMessage(node: unknown, depth: number): string | null {
+  // Two levels covers `{error: {message}}` and `{errors: [{detail}]}`, the two
+  // shapes that account for nearly all of them, without walking a large payload.
+  if (depth > 2 || node == null) return null;
+
+  if (typeof node === 'string') return node.trim() || null;
+
+  if (Array.isArray(node)) {
+    for (const item of node) {
+      const found = pickMessage(item, depth + 1);
+      if (found) return found;
+    }
+    return null;
+  }
+
+  if (typeof node !== 'object') return null;
+  const obj = node as Record<string, unknown>;
+
+  for (const key of MESSAGE_KEYS) {
+    const v = obj[key];
+    if (typeof v === 'string' && v.trim()) return v.trim();
+  }
+  // `{error: …}` where error is itself an object or a string — the single most
+  // common wrapper, so it is worth descending into by name rather than scanning
+  // every key and risking picking up an echoed request parameter.
+  for (const key of ['error', 'errors', 'fault', 'Error', 'data']) {
+    if (key in obj) {
+      const found = pickMessage(obj[key], depth + 1);
+      if (found) return found;
+    }
+  }
+  return null;
+}
+
+/** Errors are read in a single line of log output; newlines and runs of
+ *  whitespace make a multi-line body unreadable there. */
+function collapse(s: string): string {
+  return s.replace(/\s+/g, ' ').trim();
+}
 /**
  * LeadConnector / GoHighLevel MCP Pack — wraps the GoHighLevel CRM for AI agents.
  *
- * BYO key: pass _apiKey on every call. This is a GoHighLevel/LeadConnector
- * **Location API key** (in the dashboard: Settings → Business Profile → API Key).
- * It is a single static bearer token scoped to one Location (sub-account).
+ * BYO key: pass _apiKey on every call. TWO token generations are accepted and the
+ * pack routes on the prefix — see "TWO TOKEN GENERATIONS" below:
+ *   - `pit-` → v2 **Private Integration Token** (Settings → Private Integrations).
+ *     Preferred, and the only one new accounts can create. Requires `locationId`.
+ *   - anything else → v1 **Location API key** (Settings → Business Profile → API
+ *     Key), a static bearer scoped to one Location. Still works if you hold one,
+ *     but GoHighLevel is retiring them.
  *
- * API: GoHighLevel v1 REST API — base https://rest.gohighlevel.com/v1
- * Auth: `Authorization: Bearer ${apiKey}`.
+ * API: v2 https://services.leadconnectorhq.com (needs `Version: 2021-07-28`)
+ *      v1 https://rest.gohighlevel.com/v1
+ * Auth: `Authorization: Bearer ${apiKey}` on both.
  * Quirks:
  *   - Collection responses are wrapped, e.g. {contacts:[...], meta:{...}},
  *     {pipelines:[...]}, {campaigns:[...]}.
@@ -34,10 +693,57 @@ interface McpToolExport {
  *   - A missing/invalid key returns HTTP 401 {"msg":"Api key is invalid."}.
  *   - v1 /users/ is deprecated for Location keys (401 "Switch to the new API token"),
  *     so no users tool is exposed.
+ *
+ * TWO TOKEN GENERATIONS, and v1 cannot tell you which one you have.
+ * GoHighLevel now issues v2 **Private Integration Tokens** (`pit-` prefixed) to
+ * new accounts, and v1 answers one of those with the SAME generic
+ * {"msg":"Api key is invalid."} it gives a typo'd key. Measured 2026-08-27:
+ *   v1 /pipelines/ + a fake v1 key   -> 401 {"msg":"Api key is invalid."}
+ *   v1 /pipelines/ + a fake pit- key -> 401 {"msg":"Api key is invalid."}   <- identical
+ * So a caller holding a perfectly valid pit- token gets told their key is bad,
+ * which is the one thing it is not. We check the prefix ourselves and say so.
+ *
+ * v2 lives at https://services.leadconnectorhq.com and needs a `Version:
+ * 2021-07-28` header alongside the bearer token (same probe: omit it and v2
+ * answers 401 "version header was not found."; include it with a bad token and
+ * it answers 401 "Invalid Private Integration token" — i.e. the endpoint and
+ * header shape are right, only the token was fake).
+ *
+ * BOTH GENERATIONS NOW WORK (fleet #1046, 2026-09-01). GoHighLevel has retired
+ * v1 key creation, so refusing `pit-` tokens meant refusing every new account.
+ * We now pick the generation off the token prefix: `pit-` routes to v2, anything
+ * else to v1. v2 is location-scoped in the QUERY STRING rather than in the token,
+ * so a `pit-` token must be accompanied by `locationId` — that is not optional
+ * and v2 answers a missing one with a 422, so we ask for it up front instead.
+ *
+ * HONESTY NOTE, because the distinction matters more than the code: the v1 path
+ * below was verified against live 401s (see the measured probes above). The v2
+ * path is written to the documented v2 contract and is NOT verified against a
+ * live `pit-` token — we hold none, and no free tier issues one (GoHighLevel is
+ * a paid CRM). What IS verified is the routing: a `pit-` token reaches v2 with
+ * the Version header rather than being rejected locally. If a v2 route is wrong,
+ * the caller gets GoHighLevel's own error, which is a far better failure than
+ * the "Api key is invalid." lie v1 told them.
  */
 
 
+// Bound every fetch() in this pack to a fixed timeout — an upstream that
+// degrades without erroring would otherwise hold the Worker in `await fetch()`
+// until its own execution budget kills the request (minutes, not seconds).
+// Mirrors the epoFetch / usaspending retryFetch pattern (fleet #685).
+async function pwFetch(url: string | URL, init?: RequestInit): Promise<Response> {
+  return fetchWithTimeout(url, init ?? {}, 'LeadConnector / GoHighLevel');
+}
+
 const API = 'https://rest.gohighlevel.com/v1';
+const API_V2 = 'https://services.leadconnectorhq.com';
+// v2 rejects any request without this header, before it even looks at the token.
+const V2_VERSION = '2021-07-28';
+
+/** A `pit-` prefix is the only thing that distinguishes the two generations. */
+function isV2Token(apiKey: string): boolean {
+  return /^pit-/i.test(apiKey.trim());
+}
 
 function headers(apiKey: string): Record<string, string> {
   return {
@@ -47,12 +753,92 @@ function headers(apiKey: string): Record<string, string> {
   };
 }
 
+function headersV2(apiKey: string): Record<string, string> {
+  return { ...headers(apiKey), Version: V2_VERSION };
+}
+
+// Said in one place because it is the answer to every 401 this pack can produce.
+//
+// Leads with the instruction that WORKS TODAY, and names the token generation,
+// because this pack accepts both and the caller's 401 is nearly always a caller
+// holding the older one. Routing is by prefix: `pit-` -> v2, anything else -> v1.
+//
+// This string used to end "this pack cannot reach your account until we ship v2
+// support", which was true when feedback #102 was filed and became false the day
+// v2 landed (fleet #1046). It survived the rewrite, so the pack shipped v2 while
+// still telling every rejected caller that v2 did not exist — and telling them
+// flatly that a `pit-` token "will not work here", which is the one thing that
+// does. Worst case it aimed a caller at a v1 key GoHighLevel will no longer
+// issue. A refusal is a caller-facing instruction; when the capability changes
+// underneath it, the instruction is part of the change (fleet #797).
+const WRONG_KEY_HELP =
+  'This pack speaks BOTH GoHighLevel APIs and picks by token prefix. Preferred: a v2 ' +
+  '**Private Integration Token** (`pit-` prefixed) from Settings → Private Integrations ' +
+  'in the sub-account — pass it as `_apiKey` together with `locationId`, which v2 ' +
+  'requires. Legacy v1 **Location API keys** (the long JWT-style string under Settings → ' +
+  'Business Profile → API Key) still work if you already hold one, but GoHighLevel has ' +
+  'been retiring them and new accounts can no longer create one, so a `pit-` token is ' +
+  'the answer if your dashboard does not offer a v1 key.';
+
+/**
+ * v1 answers a v2 token with the same "Api key is invalid." it gives a typo, so
+ * the caller cannot tell a WRONG KEY from a wrong KIND of key. Catch the shape
+ * before spending a request on it.
+ *
+ * RETURNS an error envelope rather than throwing (fleet #615). A thrown Error
+ * lands in the gateway's generic catch block, which stamps `error: 'tool_error'`
+ * on EVERY thrown exception regardless of wording — the caller was told this is
+ * a Pipeworx defect when it is a BYOK wall one branch away from the pack's own
+ * `_apiKey`-missing check, which the gateway itself answers with `auth_required`.
+ * Returning the same shape here (and naming `_apiKey` in the message, which is
+ * what the gateway's classifier keys on) makes both branches agree.
+ */
+function checkV2Location(
+  toolName: string,
+  apiKey: string,
+  locationId: string | undefined,
+): { error: string; message: string; pack: string } | undefined {
+  if (!isV2Token(apiKey) || (locationId ?? '').trim()) return undefined;
+  return {
+    error: 'auth_required',
+    pack: 'leadconnector',
+    message: `${toolName} requires an API key AND a locationId when using a v2 Private Integration Token. Your token starts with "pit-", which is v2 — v2 does not carry the sub-account in the token the way a v1 Location key did, so pass \`locationId\` alongside \`_apiKey\`. Find it in the GoHighLevel URL for the sub-account (…/location/<locationId>/…) or under Settings → Business Profile.`,
+  };
+}
+
+async function lcGetV2(apiKey: string, path: string, params: URLSearchParams): Promise<unknown> {
+  const qs = params.toString();
+  const url = `${API_V2}${path}${qs ? `?${qs}` : ''}`;
+  const res = await pwFetch(url, { headers: headersV2(apiKey) });
+  if (!res.ok) {
+    const body = await res.text();
+    if (res.status === 401) {
+      throw new Error(
+        `LeadConnector v2 returned 401 — GoHighLevel rejected the Private Integration Token. Check the token is current and that its scopes cover this endpoint. GoHighLevel said: ${summarizeErrorBody(body)}`,
+      );
+    }
+    throw new Error(`LeadConnector v2: ${res.status} ${summarizeErrorBody(body)}`);
+  }
+  return res.json();
+}
+
 async function lcGet(apiKey: string, path: string, params?: URLSearchParams): Promise<unknown> {
   const qs = params?.toString();
   const url = `${API}${path}${qs ? `?${qs}` : ''}`;
-  const res = await fetch(url, { headers: headers(apiKey) });
+  const res = await pwFetch(url, { headers: headers(apiKey) });
   if (!res.ok) {
     const body = await res.text();
+    if (res.status === 401) {
+      // NO `auth_required:` prefix here. `auth_required` joined CLASS_TOKENS
+      // 2026-08-29 (fleet #638) so the token IS stripped now — but this file
+      // predates that fix, was caught leaking it live, and switched to plain
+      // wording instead of trusting the strip. No reason to revert: the 401
+      // below is what classifyToolError keys on regardless, and it reads as
+      // English either way, so there's nothing to gain by adding the token back.
+      throw new Error(
+        `LeadConnector returned 401. ${WRONG_KEY_HELP} GoHighLevel said: ${body.slice(0, 120)}`,
+      );
+    }
     throw new Error(`LeadConnector: ${res.status} ${body.slice(0, 200)}`);
   }
   return res.json();
@@ -64,11 +850,12 @@ const tools: McpToolExport['tools'] = [
   {
     name: 'leadconnector_list_contacts',
     description:
-      'Search or list CRM contacts in a GoHighLevel/LeadConnector account. Free-text query matches name, email, or phone. Returns a {contacts:[...], meta} envelope with contact IDs, names, emails, phones, tags, and custom fields.',
+      'Search or list CRM contacts in a GoHighLevel/LeadConnector account. Free-text query matches name, email, or phone. Returns a {contacts:[...], meta} envelope with contact IDs, names, emails, phones, tags, and custom fields. Requires your own GoHighLevel token via _apiKey (plus locationId for a v2 `pit-` token).',
     inputSchema: {
       type: 'object' as const,
       properties: {
-        _apiKey: { type: 'string', description: 'GoHighLevel/LeadConnector Location API key (Settings → Business Profile → API Key)' },
+        _apiKey: { type: 'string', description: 'Your own GoHighLevel/LeadConnector token (BYO — Pipeworx does not supply one). Either a v2 Private Integration Token (`pit-` prefixed; Settings → Private Integrations) — pass `locationId` with it — or a legacy v1 Location API key (Settings → Business Profile → API Key). GoHighLevel has retired v1 key creation, so new accounts will have a v2 token.' },
+        locationId: { type: 'string', description: 'GoHighLevel sub-account (Location) ID. REQUIRED with a v2 `pit-` token, ignored for a v1 key. It is the id in the dashboard URL: …/location/<locationId>/…' },
         query: { type: 'string', description: 'Free-text search across contact name, email, and phone' },
         limit: { type: 'number', description: 'Max contacts to return (default 20, max 100)' },
       },
@@ -78,11 +865,12 @@ const tools: McpToolExport['tools'] = [
   {
     name: 'leadconnector_get_contact',
     description:
-      'Fetch a single CRM contact by its contact ID. Returns full detail: name, email, phone, tags, source, custom fields, and timestamps.',
+      'Fetch a single CRM contact by its contact ID. Returns full detail: name, email, phone, tags, source, custom fields, and timestamps. Requires your own GoHighLevel token via _apiKey (plus locationId for a v2 `pit-` token).',
     inputSchema: {
       type: 'object' as const,
       properties: {
-        _apiKey: { type: 'string', description: 'GoHighLevel/LeadConnector Location API key' },
+        _apiKey: { type: 'string', description: 'Your own GoHighLevel/LeadConnector token (BYO — Pipeworx does not supply one). Either a v2 Private Integration Token (`pit-` prefixed; Settings → Private Integrations) — pass `locationId` with it — or a legacy v1 Location API key (Settings → Business Profile → API Key). GoHighLevel has retired v1 key creation, so new accounts will have a v2 token.' },
+        locationId: { type: 'string', description: 'GoHighLevel sub-account (Location) ID. REQUIRED with a v2 `pit-` token, ignored for a v1 key. It is the id in the dashboard URL: …/location/<locationId>/…' },
         contactId: { type: 'string', description: 'GoHighLevel contact ID' },
       },
       required: ['_apiKey', 'contactId'],
@@ -91,11 +879,12 @@ const tools: McpToolExport['tools'] = [
   {
     name: 'leadconnector_list_pipelines',
     description:
-      'List all sales pipelines and their stages in the account. Returns a {pipelines:[...]} envelope with pipeline IDs, names, and ordered stages. Use the returned pipeline ID with leadconnector_list_opportunities.',
+      'List all sales pipelines and their stages in the account. Returns a {pipelines:[...]} envelope with pipeline IDs, names, and ordered stages. Use the returned pipeline ID with leadconnector_list_opportunities. Requires your own GoHighLevel token via _apiKey (plus locationId for a v2 `pit-` token).',
     inputSchema: {
       type: 'object' as const,
       properties: {
-        _apiKey: { type: 'string', description: 'GoHighLevel/LeadConnector Location API key' },
+        _apiKey: { type: 'string', description: 'Your own GoHighLevel/LeadConnector token (BYO — Pipeworx does not supply one). Either a v2 Private Integration Token (`pit-` prefixed; Settings → Private Integrations) — pass `locationId` with it — or a legacy v1 Location API key (Settings → Business Profile → API Key). GoHighLevel has retired v1 key creation, so new accounts will have a v2 token.' },
+        locationId: { type: 'string', description: 'GoHighLevel sub-account (Location) ID. REQUIRED with a v2 `pit-` token, ignored for a v1 key. It is the id in the dashboard URL: …/location/<locationId>/…' },
       },
       required: ['_apiKey'],
     },
@@ -103,11 +892,12 @@ const tools: McpToolExport['tools'] = [
   {
     name: 'leadconnector_list_opportunities',
     description:
-      'List opportunities (pipeline deals) for a given pipeline. Requires a pipelineId (get one from leadconnector_list_pipelines). Returns deals with monetary value, stage, status, and the associated contact.',
+      'List opportunities (pipeline deals) for a given pipeline. Requires a pipelineId (get one from leadconnector_list_pipelines). Returns deals with monetary value, stage, status, and the associated contact. Requires your own GoHighLevel token via _apiKey (plus locationId for a v2 `pit-` token).',
     inputSchema: {
       type: 'object' as const,
       properties: {
-        _apiKey: { type: 'string', description: 'GoHighLevel/LeadConnector Location API key' },
+        _apiKey: { type: 'string', description: 'Your own GoHighLevel/LeadConnector token (BYO — Pipeworx does not supply one). Either a v2 Private Integration Token (`pit-` prefixed; Settings → Private Integrations) — pass `locationId` with it — or a legacy v1 Location API key (Settings → Business Profile → API Key). GoHighLevel has retired v1 key creation, so new accounts will have a v2 token.' },
+        locationId: { type: 'string', description: 'GoHighLevel sub-account (Location) ID. REQUIRED with a v2 `pit-` token, ignored for a v1 key. It is the id in the dashboard URL: …/location/<locationId>/…' },
         pipelineId: { type: 'string', description: 'Pipeline ID to list opportunities for (from leadconnector_list_pipelines)' },
         limit: { type: 'number', description: 'Max opportunities to return (default 20, max 100)' },
       },
@@ -117,11 +907,12 @@ const tools: McpToolExport['tools'] = [
   {
     name: 'leadconnector_list_campaigns',
     description:
-      'List marketing/automation campaigns in the account. Returns a {campaigns:[...]} envelope with campaign IDs, names, and status. Useful for finding a campaign to attribute or enroll contacts.',
+      'List marketing/automation campaigns in the account. Returns a {campaigns:[...]} envelope with campaign IDs, names, and status. Useful for finding a campaign to attribute or enroll contacts. Requires your own GoHighLevel token via _apiKey (plus locationId for a v2 `pit-` token).',
     inputSchema: {
       type: 'object' as const,
       properties: {
-        _apiKey: { type: 'string', description: 'GoHighLevel/LeadConnector Location API key' },
+        _apiKey: { type: 'string', description: 'Your own GoHighLevel/LeadConnector token (BYO — Pipeworx does not supply one). Either a v2 Private Integration Token (`pit-` prefixed; Settings → Private Integrations) — pass `locationId` with it — or a legacy v1 Location API key (Settings → Business Profile → API Key). GoHighLevel has retired v1 key creation, so new accounts will have a v2 token.' },
+        locationId: { type: 'string', description: 'GoHighLevel sub-account (Location) ID. REQUIRED with a v2 `pit-` token, ignored for a v1 key. It is the id in the dashboard URL: …/location/<locationId>/…' },
       },
       required: ['_apiKey'],
     },
@@ -132,10 +923,19 @@ const tools: McpToolExport['tools'] = [
 
 async function callTool(name: string, args: Record<string, unknown>): Promise<unknown> {
   const apiKey = args._apiKey as string | undefined;
+  const locationId = typeof args.locationId === 'string' ? args.locationId.trim() : undefined;
   delete args._context;
   delete args._apiKey;
 
-  if (!apiKey) throw new Error('_apiKey is required for LeadConnector/GoHighLevel API access');
+  if (!apiKey) {
+    throw new Error(
+      `user_error: LeadConnector/GoHighLevel requires an API key. Pass your own token via _apiKey — Pipeworx does not front one for this source, because GoHighLevel is a paid CRM and the token is scoped to YOUR account. ${WRONG_KEY_HELP}`,
+    );
+  }
+  const locErr = checkV2Location(name, apiKey, locationId);
+  if (locErr) return locErr;
+
+  if (isV2Token(apiKey)) return callV2(name, apiKey, locationId as string, args);
 
   switch (name) {
     case 'leadconnector_list_contacts': {
@@ -160,4 +960,40 @@ async function callTool(name: string, args: Record<string, unknown>): Promise<un
   }
 }
 
+/**
+ * v2 routes, per the documented 2021-07-28 contract. The shapes differ from v1
+ * in two ways that matter: the sub-account travels as a query param instead of
+ * being baked into the token, and opportunities are a top-level /search rather
+ * than a child of the pipeline.
+ */
+async function callV2(
+  name: string,
+  apiKey: string,
+  locationId: string,
+  args: Record<string, unknown>,
+): Promise<unknown> {
+  switch (name) {
+    case 'leadconnector_list_contacts': {
+      const params = new URLSearchParams({ locationId });
+      if (args.query) params.set('query', String(args.query));
+      params.set('limit', String(Math.min(100, Number(args.limit) || 20)));
+      return lcGetV2(apiKey, '/contacts/', params);
+    }
+    case 'leadconnector_get_contact':
+      return lcGetV2(apiKey, `/contacts/${encodeURIComponent(String(args.contactId))}`, new URLSearchParams());
+    case 'leadconnector_list_pipelines':
+      return lcGetV2(apiKey, '/opportunities/pipelines', new URLSearchParams({ locationId }));
+    case 'leadconnector_list_opportunities': {
+      const params = new URLSearchParams({ location_id: locationId });
+      if (args.pipelineId) params.set('pipelineId', String(args.pipelineId));
+      params.set('limit', String(Math.min(100, Number(args.limit) || 20)));
+      return lcGetV2(apiKey, '/opportunities/search', params);
+    }
+    case 'leadconnector_list_campaigns':
+      return lcGetV2(apiKey, '/campaigns/', new URLSearchParams({ locationId }));
+    default:
+      throw new Error(`Unknown tool: ${name}`);
+  }
+}
+
 export default { tools, callTool, meter: { credits: 1 } } satisfies McpToolExport;

package/src/server.ts

@@ -0,0 +1,45 @@
+/**
+ * Stdio MCP server entry point for @pipeworx/mcp-leadconnector.
+ * Generated by scripts/publish-pack.sh — do not hand-edit in the pack repo;
+ * edit scripts/publish-pack.sh (the server.ts heredoc) and republish instead.
+ */
+import { Server } from '@modelcontextprotocol/sdk/server/index.js';
+import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
+import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js';
+import pack from './index.js';
+
+const server = new Server(
+  { name: '@pipeworx/mcp-leadconnector', version: '0.1.2' },
+  { capabilities: { tools: {} } },
+);
+
+server.setRequestHandler(ListToolsRequestSchema, async () => ({
+  tools: pack.tools.map((t) => ({
+    name: t.name,
+    description: t.description,
+    inputSchema: t.inputSchema,
+  })),
+}));
+
+server.setRequestHandler(CallToolRequestSchema, async (request) => {
+  const { name, arguments: args } = request.params;
+  try {
+    const result = await pack.callTool(name, (args ?? {}) as Record<string, unknown>);
+    return { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] };
+  } catch (err) {
+    return {
+      content: [{ type: 'text', text: err instanceof Error ? err.message : String(err) }],
+      isError: true,
+    };
+  }
+});
+
+async function main() {
+  const transport = new StdioServerTransport();
+  await server.connect(transport);
+}
+
+main().catch((err) => {
+  console.error('Fatal error running server:', err);
+  process.exit(1);
+});

package/tsconfig.json

@@ -3,12 +3,16 @@
     "target": "ES2022",
     "module": "ESNext",
     "moduleResolution": "bundler",
+    "lib": ["ES2022"],
+    "types": ["@cloudflare/workers-types"],
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
+    "resolveJsonModule": true,
     "outDir": "dist",
     "rootDir": "src",
     "declaration": true
   },
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["src/server.ts"]
 }