@webhooks-cc/mcp 1.23.0 → 2.0.0

package/dist/{chunk-TMX4P6ZZ.mjs → chunk-VANGXSK7.mjs}

@@ -241,6 +241,209 @@ function compactRequest(request) {
   return compact;
 }
 
+// src/catalog.ts
+var TOOL_GROUPS = {
+  core: "Endpoints, captured requests and emails, sending test webhooks, signatures, forwarding destinations, deliveries, previews of your local app and their logs, usage and approvals",
+  forwarding: "The rest of forwarding: preview what a destination would send, the endpoint's forwarding settings and signing secret, test deliveries",
+  layouts: "Email layouts and named fields: try layouts and fields on a captured email, add ready-made layouts, and AI setup",
+  extras: "Bulk endpoint changes, favourites, request counts and payload schemas",
+  teams: "Teams: members, invites, sharing endpoints with a team, and pricing team changes",
+  account: "The account: billing, API keys, connected agents, public share links to requests, and the display name",
+  domains: "Custom inbound email domains: add, verify, route and remove them",
+  sheets: "Google Sheets destinations: Google accounts, spreadsheets and their tabs",
+  names: "Preview names: reserve, release and password-protect them"
+};
+var TOOL_GROUP_NAMES = Object.keys(TOOL_GROUPS);
+var read = { readOnly: true };
+var write = {};
+var update = { idempotent: true };
+var remove = { destructive: true, idempotent: true };
+var replace = { destructive: true, idempotent: true };
+var outward = { openWorld: true };
+function group(name, tools) {
+  return Object.fromEntries(
+    Object.entries(tools).map(([tool, behaviour]) => [tool, { group: name, ...behaviour }])
+  );
+}
+var TOOL_CATALOG = {
+  ...group("core", {
+    create_endpoint: write,
+    list_endpoints: read,
+    get_endpoint: read,
+    // Replaces what it is given (a mock response, the signing secret).
+    update_endpoint: replace,
+    delete_endpoint: remove,
+    list_requests: read,
+    search_requests: read,
+    get_request: read,
+    wait_for_request: read,
+    wait_for_requests: read,
+    replay_request: outward,
+    compare_requests: read,
+    extract_from_request: read,
+    clear_requests: remove,
+    send_webhook: write,
+    send_to: outward,
+    test_webhook_flow: outward,
+    preview_webhook: read,
+    preview_response: read,
+    list_provider_templates: read,
+    verify_signature: read,
+    list_emails: read,
+    get_email: read,
+    wait_for_email: read,
+    send_test_email: write,
+    render_email: outward,
+    list_destinations: read,
+    add_destination: write,
+    update_destination: replace,
+    remove_destination: remove,
+    list_deliveries: read,
+    redeliver: outward,
+    share_port: outward,
+    list_shares: read,
+    share_requests: read,
+    stop_share: remove,
+    get_usage: read,
+    // Collecting an approved key hands it over once: not a pure read.
+    wait_for_approval: write,
+    describe: read
+  }),
+  ...group("forwarding", {
+    preview_destination: read,
+    configure_forwarding: replace,
+    // rotate: true replaces the secret, and receivers holding the old one fail.
+    get_forwarding_secret: { destructive: true },
+    test_forwarding: outward
+  }),
+  ...group("layouts", {
+    preview_layouts: read,
+    list_layout_templates: read,
+    add_layout_template: write,
+    preview_email_fields: read,
+    ai_setup_status: read,
+    // Sends the chosen emails to Anthropic once the owner approves.
+    ai_setup: outward
+  }),
+  ...group("extras", {
+    create_endpoints: write,
+    delete_endpoints: remove,
+    favorite_endpoint: update,
+    count_requests: read,
+    generate_payload_schema: read
+  }),
+  ...group("teams", {
+    list_teams: read,
+    list_team_members: read,
+    share_endpoint: update,
+    unshare_endpoint: remove,
+    create_team: write,
+    rename_team: update,
+    delete_team: remove,
+    remove_team_member: remove,
+    leave_team: remove,
+    invite_to_team: outward,
+    list_invites: read,
+    answer_invite: write,
+    withdraw_invite: remove,
+    quote_team_change: read
+  }),
+  ...group("account", {
+    get_billing: read,
+    list_api_keys: read,
+    create_api_key: write,
+    revoke_api_key: remove,
+    rename_account: update,
+    list_connected_agents: read,
+    disconnect_agent: remove,
+    list_share_links: read,
+    create_share_link: write,
+    revoke_share_link: remove
+  }),
+  ...group("domains", {
+    list_domains: read,
+    add_domain: write,
+    // A failed check counts toward lapsing a verified domain: not safe to repeat.
+    verify_domain: { destructive: true },
+    // Replaces the routing; a missing catch-all refuses mail.
+    route_domain: replace,
+    remove_domain: remove
+  }),
+  ...group("sheets", {
+    list_google_connections: read,
+    connect_google: outward,
+    pick_spreadsheet: outward,
+    create_spreadsheet: outward,
+    list_sheet_tabs: { readOnly: true, openWorld: true },
+    disconnect_google: remove
+  }),
+  ...group("names", {
+    // The log of what visitors asked a running preview for.
+    list_names: read,
+    reserve_name: write,
+    release_name: remove,
+    set_name_password: update,
+    // Opens the name to anyone again.
+    clear_name_password: { destructive: true, idempotent: true }
+  })
+};
+var ENABLE_TOOLS = "enable_tools";
+function toolAnnotations(name) {
+  const entry = TOOL_CATALOG[name];
+  const readOnly = entry?.readOnly === true;
+  return {
+    title: toolTitle(name),
+    readOnlyHint: readOnly,
+    // MCP reads a missing destructiveHint as true on any tool that writes.
+    destructiveHint: !readOnly && entry?.destructive === true,
+    idempotentHint: readOnly || entry?.idempotent === true,
+    openWorldHint: entry?.openWorld === true
+  };
+}
+function toolTitle(name) {
+  const words = name.split("_").map((word) => TITLE_WORDS[word] ?? word);
+  const first = words[0] ?? "";
+  return [first.charAt(0).toUpperCase() + first.slice(1), ...words.slice(1)].join(" ");
+}
+var TITLE_WORDS = {
+  api: "API",
+  ai: "AI",
+  mcp: "MCP"
+};
+function parseToolGroups(setting) {
+  if (setting === null || setting === void 0 || setting.trim() === "") return null;
+  const groups = /* @__PURE__ */ new Set(["core"]);
+  const unknown = [];
+  for (const raw of setting.split(/[\s,+]+/)) {
+    const name = raw.trim().toLowerCase();
+    if (!name) continue;
+    if (name === "all") {
+      for (const g of TOOL_GROUP_NAMES) groups.add(g);
+    } else if (TOOL_GROUP_NAMES.includes(name)) {
+      groups.add(name);
+    } else {
+      unknown.push(raw.trim());
+    }
+  }
+  return { groups, unknown };
+}
+var LOADS_EVERYTHING = [
+  /^claude-code$/i,
+  /^claude-ai$/i,
+  /^claude$/i,
+  /codex/i,
+  /^openai-mcp$/i,
+  /chatgpt/i
+];
+function clientLoadsEverything(clientName) {
+  if (!clientName) return false;
+  const name = clientName.trim().toLowerCase().replace(/[\s_]+/g, "-");
+  return LOADS_EVERYTHING.some((pattern) => pattern.test(name));
+}
+function defaultToolGroups(clientName) {
+  return clientLoadsEverything(clientName) ? new Set(TOOL_GROUP_NAMES) : /* @__PURE__ */ new Set(["core"]);
+}
+
 // src/tools.ts
 var MAX_BODY_SIZE = MAX_OUTPUT;
 var HTTP_METHODS = ["GET", "POST", "PUT", "PATCH", "DELETE", "HEAD", "OPTIONS"];
@@ -501,6 +704,14 @@ ${JSON.stringify(result, null, 2)}`;
   if (typeof result.url === "string") {
     return `Approved. The share link is ${result.url} (anyone with it can read the copy until ${String(result.expiresAt)}).`;
   }
+  if (typeof result.invitedEmail === "string") {
+    const team = typeof result.teamName === "string" ? ` to "${result.teamName}"` : "";
+    const warning = typeof result.warning === "string" ? ` ${result.warning} Tell them to sign up with that address and accept from their Teams page.` : " They get an email; accepting claims one of the team's seats.";
+    return `Approved. Invited ${result.invitedEmail}${team} (invite ${String(result.id)}).${warning}`;
+  }
+  if (typeof result.deleted === "string" && typeof result.teamId === "string") {
+    return `Approved. The team ${result.deleted ? `"${result.deleted}" ` : ""}was deleted; its subscription has ended.`;
+  }
   if (typeof result.removed === "string") {
     return `Approved. The domain ${result.removed} was removed; mail to it is refused now.`;
   }
@@ -575,6 +786,75 @@ function fitArrayField(value, key) {
   }
   return cut(low);
 }
+function isoTime(ms) {
+  if (ms === null || !Number.isFinite(ms)) return null;
+  const date = new Date(ms);
+  return Number.isNaN(date.getTime()) ? null : date.toISOString();
+}
+function searchStoppedNote(searchedUntil, order, hasCursor) {
+  const [direction, rest] = order === "asc" ? ["forward", "newer"] : ["back", "older"];
+  const reached = searchedUntil ? `Searched ${direction} to ${searchedUntil}; ${rest} requests were not searched yet.` : `The search stopped before it read everything; ${rest} requests were not searched yet.`;
+  return hasCursor ? `${reached} Call search_requests again with cursor to continue.` : reached;
+}
+var FULL_REQUEST_HINT = "The full request is available from the API (GET /api/requests/{id}), the SDKs (requests.get(id)) or the CLI (whk requests get <id>).";
+var SEARCH_SHORTENED_NOTE = `Some requests were shortened to fit the output (bodyTruncated with bodySize, or shortened: true for a summary); get_request with the id returns as much of one request as fits. ${FULL_REQUEST_HINT}`;
+var REQUEST_SHORTENED_NOTE = `This request was cut to fit the output: its body (bodyTruncated, with bodySize), or everything but a summary (shortened: true). ${FULL_REQUEST_HINT}`;
+function clip(value, max) {
+  return typeof value === "string" ? sliceText(value, max) : void 0;
+}
+function listedSize(request) {
+  return jsonSize([[request]]) - 8;
+}
+function fitSearchRequests(requests, room) {
+  const share = Math.floor(room / Math.max(1, requests.length));
+  const fitted = requests.map(
+    (request) => shortenRequest(request, share, listedSize)
+  );
+  if (fitted.every((request) => listedSize(request) <= share)) return fitted;
+  return requests.map((request) => {
+    const { id, receivedAt } = request;
+    return { id, receivedAt, shortened: true };
+  });
+}
+function shortenRequest(request, share, sizeOf) {
+  if (sizeOf(request) <= share) return request;
+  if (typeof request.body === "string") {
+    const body = request.body;
+    let keep = body.length - (sizeOf(request) - share) - 96;
+    while (keep > 0) {
+      const cut = {
+        ...request,
+        body: sliceText(body, keep),
+        bodyTruncated: true,
+        bodySize: body.length
+      };
+      if (sizeOf(cut) <= share) return cut;
+      keep = Math.floor(keep / 2);
+    }
+  }
+  const email = request.email;
+  const summary = {
+    id: request.id,
+    slug: clip(request.slug, 64),
+    method: clip(request.method, 16),
+    path: clip(request.path, 200),
+    contentType: clip(request.contentType, 100),
+    size: request.size,
+    receivedAt: request.receivedAt,
+    kind: request.kind,
+    ...email ? { subject: clip(email.subject, 200) } : {},
+    shortened: true,
+    ...typeof request.note === "string" ? { note: request.note } : {}
+  };
+  return summary;
+}
+function requestContent(request) {
+  const compact = compactRequest(request);
+  if (jsonSize(compact) <= MAX_BODY_SIZE) return jsonContent(compact);
+  return jsonContent(
+    shortenRequest({ ...compact, note: REQUEST_SHORTENED_NOTE }, MAX_BODY_SIZE, jsonSize)
+  );
+}
 function jsonContent(value) {
   return textContent(serializeJson(value));
 }
@@ -619,6 +899,13 @@ function serializeError(error) {
   } else if (error instanceof WebhooksCCError) {
     payload.code = error.statusCode >= 500 ? "server_error" : "validation_error";
   }
+  if (error instanceof WebhooksCCError && payload.hint === null) {
+    if (error.code === "invalid_cursor") {
+      payload.hint = "The cursor is not one this search returned, or the order changed since. Pass a cursor exactly as a result gave it, or search again without one.";
+    } else if (error.code === "search_busy") {
+      payload.hint = "The account's other searches are still running. Wait retryAfter seconds, then call again with the same inputs.";
+    }
+  }
   return JSON.stringify(payload, null, 2);
 }
 function withErrorHandling(handler) {
@@ -843,11 +1130,18 @@ function durationMs(value) {
     return null;
   }
 }
-function toolTarget(target, remote, handles) {
+function toolTarget(target, options, handles) {
+  const remote = options.remote === true;
   return {
     tool(name, description, shape, handler) {
       if (remote && LOCAL_ONLY_TOOLS.has(name)) return { remove() {
       } };
+      const entry = TOOL_CATALOG[name];
+      if (!entry) throw new Error(`${name} has no entry in catalog.ts`);
+      if (options.groups && !options.groups.has(entry.group)) return { remove() {
+      } };
+      if (options.readOnly && entry.readOnly !== true) return { remove() {
+      } };
       const wrapped = remote ? async (args) => {
         const input = args;
         if (TARGET_URL_TOOLS.has(name) && input.targetUrl !== void 0) {
@@ -881,7 +1175,7 @@ function toolTarget(target, remote, handles) {
         }
         return handler(bounded);
       } : handler;
-      const handle = target.tool(name, description, shape, wrapped);
+      const handle = target.tool(name, description, shape, wrapped, toolAnnotations(name));
       handles.push(handle);
       return handle;
     }
@@ -957,7 +1251,7 @@ function withShareHints(list, remote = false) {
 function registerTools(target, client, options = {}) {
   const handles = [];
   const remote = options.remote === true;
-  const server = toolTarget(target, remote, handles);
+  const server = toolTarget(target, options, handles);
   const shareWith = remote ? REMOTE_SHARE : "share_port";
   server.tool(
     "create_endpoint",
@@ -1070,6 +1364,124 @@ function registerTools(target, client, options = {}) {
       return jsonContent({ shared: false, slug, teamId });
     })
   );
+  server.tool(
+    "create_team",
+    "Create a team you own, to share endpoints with its members under a pooled quota. It does nothing until it has a subscription, which the person starts in the browser (Account > Teams); until then it is suspended.",
+    { name: z.string().trim().min(1).max(100).describe("The team's name") },
+    withErrorHandling(async ({ name }) => jsonContent(await client.teams.create(name)))
+  );
+  server.tool(
+    "rename_team",
+    "Rename a team you own.",
+    {
+      teamId: z.string().min(1).describe("Team id (from list_teams)"),
+      name: z.string().trim().min(1).max(100).describe("The new name")
+    },
+    withErrorHandling(async ({ teamId, name }) => {
+      await client.teams.rename(teamId, name);
+      return jsonContent({ renamed: true, teamId, name });
+    })
+  );
+  server.tool(
+    "delete_team",
+    "Delete a team you own: its subscription ends at once, every member loses the endpoints shared with it, and it cannot be undone. Only when the person asks for it. The team's owner must approve it: this returns a link and a code to show them, then call wait_for_approval.",
+    { teamId: z.string().min(1).describe("Team id (from list_teams)") },
+    withErrorHandling(async ({ teamId }) => {
+      const pending = await client.teams.delete(teamId);
+      if (!pending.id) return textContent(`Deleted the team ${teamId}.`);
+      return textContent(approvalAskText(pending));
+    })
+  );
+  server.tool(
+    "remove_team_member",
+    "Remove a member from a team you own: the endpoints they shared with the team stop being shared, and their seat is free for someone else. Only when the person asks for it.",
+    {
+      teamId: z.string().min(1).describe("Team id (from list_teams)"),
+      userId: z.string().min(1).describe("The member's userId (from list_team_members)")
+    },
+    withErrorHandling(async ({ teamId, userId }) => {
+      await client.teams.removeMember(teamId, userId);
+      return jsonContent({ removed: true, teamId, userId });
+    })
+  );
+  server.tool(
+    "leave_team",
+    "Leave a team you belong to: the endpoints you shared with it stop being shared, and you lose access to the ones shared with you through it. An owner cannot leave; they delete the team instead (delete_team). Only when the person asks for it.",
+    { teamId: z.string().min(1).describe("Team id (from list_teams)") },
+    withErrorHandling(async ({ teamId }) => {
+      await client.teams.leave(teamId);
+      return jsonContent({ left: true, teamId });
+    })
+  );
+  server.tool(
+    "invite_to_team",
+    "Invite an email address to a team you own. It emails that address, so the team's owner must approve it: this returns a link and a code to show them, then call wait_for_approval, which returns the invite. Accepting the invite claims one of the team's paid seats. Only when the person asks for it.",
+    {
+      teamId: z.string().min(1).describe("Team id (from list_teams)"),
+      email: z.string().trim().email().describe("The address to invite")
+    },
+    withErrorHandling(async ({ teamId, email }) => {
+      const pending = await client.teams.invite(teamId, email);
+      if (!pending.id) return textContent(approvalResultText({ ...await pending.wait() }));
+      return textContent(approvalAskText(pending));
+    })
+  );
+  server.tool(
+    "list_invites",
+    "List the team invites waiting for you to answer: team, who invited you, when, and the invite id for answer_invite.",
+    {},
+    withErrorHandling(async () => jsonContent(await client.teams.invites.list()))
+  );
+  server.tool(
+    "answer_invite",
+    "Accept or decline a team invite waiting for you (from list_invites). Accepting claims one of the team's paid seats and you join the team, seeing the endpoints shared with it; it fails when the team is full or suspended. Only when the person says which.",
+    {
+      inviteId: z.string().min(1).describe("The invite's id, from list_invites"),
+      answer: z.enum(["accept", "decline"]).describe("accept joins the team; decline turns it down")
+    },
+    withErrorHandling(async ({ inviteId, answer }) => {
+      if (answer === "accept") {
+        await client.teams.invites.accept(inviteId);
+        return jsonContent({ accepted: true, inviteId });
+      }
+      await client.teams.invites.decline(inviteId);
+      return jsonContent({ declined: true, inviteId });
+    })
+  );
+  server.tool(
+    "withdraw_invite",
+    "Withdraw an invite to a team you own before it is answered (pending invites and their ids are in list_team_members). The invite link stops working.",
+    {
+      teamId: z.string().min(1).describe("Team id (from list_teams)"),
+      inviteId: z.string().min(1).describe("The invite's id (from list_team_members' pendingInvites)")
+    },
+    withErrorHandling(async ({ teamId, inviteId }) => {
+      await client.teams.withdrawInvite(teamId, inviteId);
+      return jsonContent({ withdrawn: true, teamId, inviteId });
+    })
+  );
+  server.tool(
+    "quote_team_change",
+    "What changing a team's seat count or plan would cost, read only (owner only): what is due now, any credit, and the price from the renewal. Give seats, or plan (with interval). The change itself is made by the person in the browser.",
+    {
+      teamId: z.string().min(1).describe("Team id (from list_teams)"),
+      seats: z.number().int().min(1).optional().describe("Price this seat count"),
+      plan: z.enum(["team", "team_business"]).optional().describe("Price a move to this plan: team (Teams) or team_business (Team Business)"),
+      interval: z.enum(["month", "year"]).optional().describe("Billing interval for plan (default month; Teams is monthly only)")
+    },
+    withErrorHandling(async ({ teamId, seats, plan, interval }) => {
+      if (seats === void 0 === (plan === void 0)) {
+        throw new Error("Give seats or plan, not both.");
+      }
+      if (seats !== void 0) {
+        if (interval !== void 0) throw new Error("interval goes with plan, not seats.");
+        return jsonContent(await client.billing.quoteTeamSeats(teamId, seats));
+      }
+      return jsonContent(
+        await client.billing.quoteTeamPlan(teamId, plan, interval)
+      );
+    })
+  );
   server.tool(
     "get_endpoint",
     "Get details for a specific webhook endpoint by slug.",
@@ -1163,6 +1575,35 @@ function registerTools(target, client, options = {}) {
       return jsonContent(holder);
     })
   );
+  server.tool(
+    "list_layout_templates",
+    "List the ready-made email layouts (order emails from Shopify, WooCommerce, Etsy and more, payments, bookings, attachments): each with its id, sender, kind, description, the fields it reads and whether it reads line items. Add one with add_layout_template.",
+    { slug: z.string().describe("The endpoint slug") },
+    withErrorHandling(async ({ slug }) => jsonContent(await client.endpoints.layoutTemplates(slug)))
+  );
+  server.tool(
+    "add_layout_template",
+    "Add a ready-made layout (an id from list_layout_templates) to the end of an endpoint's layouts. Emails it matches are parsed from the next one on; check it on a captured email with preview_layouts. Owner only.",
+    {
+      slug: z.string().describe("The endpoint slug"),
+      template: z.string().min(1).describe("The template's id, from list_layout_templates")
+    },
+    withErrorHandling(
+      async ({ slug, template }) => jsonContent(await client.endpoints.addLayoutTemplate(slug, template))
+    )
+  );
+  server.tool(
+    "preview_email_fields",
+    "Dry run of an endpoint's named email fields on a captured email: each field's value (null where it finds nothing), and problems with fields you pass. Nothing is saved. Pass emailFields to try fields before saving them with update_endpoint. Owner only.",
+    {
+      slug: z.string().describe("The endpoint slug"),
+      requestId: z.string().optional().describe("A captured email on the endpoint (default: the newest)"),
+      emailFields: z.array(emailFieldSchema).max(20).optional().describe("Unsaved fields to try instead of the saved ones")
+    },
+    withErrorHandling(
+      async ({ slug, requestId, emailFields }) => jsonContent(await client.endpoints.previewEmailFields(slug, { requestId, emailFields }))
+    )
+  );
   server.tool(
     "preview_response",
     "Dry run of an endpoint's responses: which response rule answers a captured request, and the response with its {{ placeholders }} filled in, exactly as the receiver would send it. Nothing is sent. Pass mockResponse or responseRules to try settings before saving them with update_endpoint.",
@@ -1298,56 +1739,95 @@ function registerTools(target, client, options = {}) {
   );
   server.tool(
     "search_requests",
-    "Search captured webhook requests across endpoints using retained full-text search.",
+    "Search captured requests and emails across endpoints: a substring match on path, headers, body and decoded email fields. One call reads back through history for about 2 seconds and returns { requests, complete, searchedUntil, cursor }. When complete is false, older requests were not searched yet: call again with the cursor and the same filters to continue.",
     {
       slug: z.string().optional().describe("Filter to a specific endpoint slug"),
       method: z.string().optional().describe("Filter by HTTP method"),
       kind: kindSchema,
-      q: z.string().optional().describe("Free-text search across path, body, and headers"),
-      from: durationOrTimestampSchema.optional().describe('Start time as a timestamp or duration like "1h" or "7d"'),
-      to: durationOrTimestampSchema.optional().describe('End time as a timestamp or duration like "1h" or "7d"'),
+      q: z.string().optional().describe(
+        "Substring to find in the path, headers, body and decoded email fields (up to 1,000 characters)"
+      ),
+      from: durationOrTimestampSchema.optional().describe(
+        'Start time as a timestamp (Unix ms) or a duration back from now like "1h" or "7d". A duration is counted from each call, so when you continue with a cursor pass a timestamp to keep the same range.'
+      ),
+      to: durationOrTimestampSchema.optional().describe(
+        'End time as a timestamp (Unix ms) or a duration back from now like "1h" or "7d". A duration is counted from each call, so when you continue with a cursor pass a timestamp to keep the same range.'
+      ),
       limit: z.number().int().min(1).max(200).default(50).describe("Max results to return"),
-      offset: z.number().int().min(0).max(1e4).default(0).describe("Result offset"),
-      order: z.enum(["asc", "desc"]).default("desc").describe("Sort order by received time")
+      offset: z.number().int().min(0).max(1e4).default(0).describe("Matches to skip (first call only; a cursor carries what is left of it)"),
+      order: z.enum(["asc", "desc"]).default("desc").describe("Sort order by received time"),
+      cursor: z.string().optional().describe(
+        "The cursor from a previous search_requests result, to continue that search. Keep the other inputs the same."
+      )
     },
-    withErrorHandling(async ({ slug, method, kind, q, from, to, limit, offset, order }) => {
-      const results = await client.requests.search({
-        slug,
-        method,
-        kind,
-        q,
-        from,
-        to,
-        limit,
-        offset,
-        order
-      });
-      return jsonContent(results.map(compactRequest));
+    withErrorHandling(async ({ slug, method, kind, q, from, to, limit, offset, order, cursor }) => {
+      const page = await client.requests.searchPage(
+        { slug, method, kind, q, from, to, limit, offset, order },
+        { cursor }
+      );
+      const searchedUntil = isoTime(page.searchedUntil);
+      const envelope = (requests2, shortened) => {
+        const notes = [
+          ...page.complete ? [] : [searchStoppedNote(searchedUntil, order, Boolean(page.cursor))],
+          ...shortened ? [SEARCH_SHORTENED_NOTE] : []
+        ];
+        return {
+          requests: requests2,
+          complete: page.complete,
+          searchedUntil,
+          cursor: page.cursor,
+          ...notes.length > 0 ? { note: notes.join(" ") } : {}
+        };
+      };
+      const requests = page.requests.map(compactRequest);
+      if (jsonSize(envelope(requests, false)) <= MAX_BODY_SIZE) {
+        return jsonContent(envelope(requests, false));
+      }
+      const room = MAX_BODY_SIZE - jsonSize(envelope([], true)) - 8;
+      return jsonContent(envelope(fitSearchRequests(requests, room), true));
     })
   );
   server.tool(
     "count_requests",
-    "Count captured webhook requests that match the given filters.",
+    "Count captured requests and emails that match the given filters (q is a substring match on path, headers, body and decoded email fields). Returns { count, exact, searchedUntil, cursor }. With q or method a call counts back through history for about 2 seconds: when exact is false, count covers history back to searchedUntil only, and calling again with the cursor counts the next stretch (add the counts up).",
     {
       slug: z.string().optional().describe("Filter to a specific endpoint slug"),
       method: z.string().optional().describe("Filter by HTTP method"),
       kind: kindSchema,
-      q: z.string().optional().describe("Free-text search across path, body, and headers"),
-      from: durationOrTimestampSchema.optional().describe('Start time as a timestamp or duration like "1h" or "7d"'),
-      to: durationOrTimestampSchema.optional().describe('End time as a timestamp or duration like "1h" or "7d"')
+      q: z.string().optional().describe(
+        "Substring to find in the path, headers, body and decoded email fields (up to 1,000 characters)"
+      ),
+      from: durationOrTimestampSchema.optional().describe(
+        'Start time as a timestamp (Unix ms) or a duration back from now like "1h" or "7d". A duration is counted from each call, so when you continue with a cursor pass a timestamp to keep the same range.'
+      ),
+      to: durationOrTimestampSchema.optional().describe(
+        'End time as a timestamp (Unix ms) or a duration back from now like "1h" or "7d". A duration is counted from each call, so when you continue with a cursor pass a timestamp to keep the same range.'
+      ),
+      cursor: z.string().optional().describe(
+        "The cursor from a previous count_requests result, to count the next stretch. Keep the other inputs the same."
+      )
     },
-    withErrorHandling(async ({ slug, method, kind, q, from, to }) => {
-      const count = await client.requests.count({ slug, method, kind, q, from, to });
-      return jsonContent({ count });
+    withErrorHandling(async ({ slug, method, kind, q, from, to, cursor }) => {
+      const page = await client.requests.countPage({ slug, method, kind, q, from, to }, { cursor });
+      const searchedUntil = isoTime(page.searchedUntil);
+      return jsonContent({
+        count: page.count,
+        exact: page.exact,
+        searchedUntil,
+        cursor: page.cursor,
+        ...page.exact ? {} : {
+          note: `At least ${page.count}, counted ${searchedUntil ? `back to ${searchedUntil}` : "over part of the history"}; ${page.cursor ? "call count_requests again with cursor to count further (the counts add up)." : "there is no cursor to count further with."}`
+        }
+      });
     })
   );
   server.tool(
     "get_request",
-    "Get full details for a specific captured request by ID.",
+    "Get the details of a captured request by ID: method, path, headers and body. A request larger than the tool output has its body cut (bodyTruncated, bodySize) and a note saying where the whole request is available.",
     getRequestShape,
     withErrorHandling(async ({ requestId }) => {
       const request = await client.requests.get(requestId);
-      return jsonContent(compactRequest(request));
+      return requestContent(request);
     })
   );
   server.tool(
@@ -1356,7 +1836,7 @@ function registerTools(target, client, options = {}) {
     waitForRequestShape,
     withErrorHandling(async ({ endpointSlug, timeout, pollInterval }) => {
       const request = await client.requests.waitFor(endpointSlug, { timeout, pollInterval });
-      return jsonContent(compactRequest(request));
+      return requestContent(request);
     })
   );
   server.tool(
@@ -2110,7 +2590,7 @@ function registerTools(target, client, options = {}) {
   );
   server.tool(
     "wait_for_approval",
-    "Wait for the account's owner to answer an approval (from create_api_key, create_share_link, remove_domain, rename_account, connect_google, pick_spreadsheet or ai_setup) and collect what it grants or did, such as the new API key, the share link or AI setup's proposals. If they have not answered yet, call it again.",
+    "Wait for the account's owner to answer an approval (from create_api_key, create_share_link, remove_domain, rename_account, delete_team, invite_to_team, connect_google, pick_spreadsheet or ai_setup) and collect what it grants or did, such as the new API key, the share link or AI setup's proposals. If they have not answered yet, call it again.",
     {
       id: z.string().describe("The approval id"),
       timeout: durationOrTimestampSchema.default("45s").describe('How long to wait for the person, for example "45s"')
@@ -2473,6 +2953,15 @@ function registerTools(target, client, options = {}) {
 }
 
 export {
+  TOOL_GROUPS,
+  TOOL_GROUP_NAMES,
+  TOOL_CATALOG,
+  ENABLE_TOOLS,
+  toolAnnotations,
+  toolTitle,
+  parseToolGroups,
+  clientLoadsEverything,
+  defaultToolGroups,
   compactRequest,
   createEndpointShape,
   listEndpointsShape,