@revfleet/hscli 0.7.0 → 0.8.0

package/dist/mcp/server.js

@@ -6,7 +6,9 @@ import { HubSpotClient } from "../core/http.js";
 import { CliError, redactSensitive } from "../core/output.js";
 import { ENGAGEMENT_OBJECT_TYPES, OBJECT_COMMAND_TYPES, PIPELINE_OBJECT_TYPES, PROPERTY_OBJECT_TYPES, appendOptional, encodePathSegment, maybeWrite, parseBooleanFlag, parseNumberFlag, parseSupportedObjectType, } from "../commands/crm/shared.js";
 import { resolvePortalContext, enrichListResponse, enrichRecordUrl, enrichCustomListResponse, enrichCustomRecordUrl, } from "../core/urls.js";
-const baseArgsSchema = {
+import { registerHubspotCompatTools } from "./compat-hubspot.js";
+import { registerExtensionTools } from "./ext-tools.js";
+export const baseArgsSchema = {
     profile: z.string().min(1).optional(),
     force: z.boolean().optional(),
     dryRun: z.boolean().optional(),
@@ -59,15 +61,7 @@ function textResult(data) {
         structuredContent: asStructuredContent(safe),
     };
 }
-async function executeTool(args, fn, toolName) {
-    // Tag every request made during this tool call with the MCP tool name, so
-    // trace files produced by `HUBCLI_TELEMETRY_FILE` show up in
-    // `hubcli trace stats --byToolName`. We use an env var rather than
-    // threading through the request options because fn() may construct
-    // arbitrary client.request() chains and we want all of them tagged.
-    const previousToolName = process.env.HUBCLI_MCP_TOOL_NAME;
-    if (toolName)
-        process.env.HUBCLI_MCP_TOOL_NAME = toolName;
+export async function executeTool(args, fn) {
     try {
         const ctx = mcpContext(args);
         const client = new HubSpotClient(getToken(ctx.profile), {
@@ -92,14 +86,44 @@ async function executeTool(args, fn, toolName) {
             }),
         };
     }
-    finally {
-        if (toolName) {
-            if (previousToolName === undefined)
+}
+/**
+ * Wrap `server.registerTool` so every MCP handler runs with
+ * HUBCLI_MCP_TOOL_NAME set to this tool's name. The HTTP layer reads this
+ * env var to tag trace/telemetry events, so `hscli trace stats` and
+ * `hscli audit by-tool` can break activity down by MCP tool.
+ *
+ * The SDK's registerTool signature is a heavily-overloaded generic; we
+ * stay loosely typed here because every callsite already builds its own
+ * config/handler with the right shape.
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function registerMcpTool(server, name, config, handler) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const wrapped = (...handlerArgs) => {
+        const previous = process.env.HUBCLI_MCP_TOOL_NAME;
+        process.env.HUBCLI_MCP_TOOL_NAME = name;
+        const restore = () => {
+            if (previous === undefined)
                 delete process.env.HUBCLI_MCP_TOOL_NAME;
             else
-                process.env.HUBCLI_MCP_TOOL_NAME = previousToolName;
+                process.env.HUBCLI_MCP_TOOL_NAME = previous;
+        };
+        try {
+            const result = handler(...handlerArgs);
+            if (result && typeof result.then === "function") {
+                return Promise.resolve(result).finally(restore);
+            }
+            restore();
+            return result;
         }
-    }
+        catch (err) {
+            restore();
+            throw err;
+        }
+    };
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    server.registerTool(name, config, wrapped);
 }
 function isEnvTrue(value) {
     if (!value)
@@ -108,7 +132,7 @@ function isEnvTrue(value) {
     return normalized === "1" || normalized === "true" || normalized === "yes";
 }
 function registerStandardObjectTools(server, objectType) {
-    server.registerTool(`crm_${objectType}_list`, {
+    registerMcpTool(server, `crm_${objectType}_list`, {
         description: `List ${objectType}`,
         inputSchema: {
             ...baseArgsSchema,
@@ -130,7 +154,7 @@ function registerStandardObjectTools(server, objectType) {
         enrichListResponse(res, portal, objectType);
         return res;
     }));
-    server.registerTool(`crm_${objectType}_get`, {
+    registerMcpTool(server, `crm_${objectType}_get`, {
         description: `Get one ${objectType.slice(0, -1)} by ID`,
         inputSchema: {
             ...baseArgsSchema,
@@ -146,7 +170,7 @@ function registerStandardObjectTools(server, objectType) {
             enrichRecordUrl(res, portal, objectType);
         return res;
     }));
-    server.registerTool(`crm_${objectType}_search`, {
+    registerMcpTool(server, `crm_${objectType}_search`, {
         description: `Search ${objectType}`,
         inputSchema: {
             ...baseArgsSchema,
@@ -167,7 +191,7 @@ function registerStandardObjectTools(server, objectType) {
         enrichListResponse(res, portal, objectType);
         return res;
     }));
-    server.registerTool(`crm_${objectType}_create`, {
+    registerMcpTool(server, `crm_${objectType}_create`, {
         description: `Create ${objectType.slice(0, -1)} (dry-run by default unless force=true)`,
         inputSchema: {
             ...baseArgsSchema,
@@ -180,7 +204,7 @@ function registerStandardObjectTools(server, objectType) {
             enrichRecordUrl(res, portal, objectType);
         return res;
     }));
-    server.registerTool(`crm_${objectType}_update`, {
+    registerMcpTool(server, `crm_${objectType}_update`, {
         description: `Update ${objectType.slice(0, -1)} (dry-run by default unless force=true)`,
         inputSchema: {
             ...baseArgsSchema,
@@ -195,26 +219,26 @@ function registerStandardObjectTools(server, objectType) {
             enrichRecordUrl(res, portal, objectType);
         return res;
     }));
-    server.registerTool(`crm_${objectType}_delete`, {
+    registerMcpTool(server, `crm_${objectType}_delete`, {
         description: `Delete/archive ${objectType.slice(0, -1)} by ID (dry-run by default unless force=true)`,
         inputSchema: { ...baseArgsSchema, id: z.string().min(1) },
     }, (args) => executeTool(args, (ctx, client) => {
         const idSegment = encodePathSegment(args.id, "id");
         return maybeWrite(ctx, client, "DELETE", `/crm/v3/objects/${objectType}/${idSegment}`);
     }));
-    server.registerTool(`crm_${objectType}_merge`, {
+    registerMcpTool(server, `crm_${objectType}_merge`, {
         description: `Merge ${objectType} records (endpoint support varies by object)`,
         inputSchema: { ...baseArgsSchema, data: z.record(z.string(), z.unknown()) },
     }, (args) => executeTool(args, (ctx, client) => maybeWrite(ctx, client, "POST", `/crm/v3/objects/${objectType}/merge`, args.data)));
-    server.registerTool(`crm_${objectType}_batch_read`, {
+    registerMcpTool(server, `crm_${objectType}_batch_read`, {
         description: `Batch read ${objectType}`,
         inputSchema: { ...baseArgsSchema, data: z.record(z.string(), z.unknown()) },
     }, (args) => executeTool(args, (_ctx, client) => client.request(`/crm/v3/objects/${objectType}/batch/read`, { method: "POST", body: args.data })));
-    server.registerTool(`crm_${objectType}_batch_upsert`, {
+    registerMcpTool(server, `crm_${objectType}_batch_upsert`, {
         description: `Batch upsert ${objectType} (dry-run by default unless force=true)`,
         inputSchema: { ...baseArgsSchema, data: z.record(z.string(), z.unknown()) },
     }, (args) => executeTool(args, (ctx, client) => maybeWrite(ctx, client, "POST", `/crm/v3/objects/${objectType}/batch/upsert`, args.data)));
-    server.registerTool(`crm_${objectType}_batch_archive`, {
+    registerMcpTool(server, `crm_${objectType}_batch_archive`, {
         description: `Batch archive ${objectType} (dry-run by default unless force=true)`,
         inputSchema: { ...baseArgsSchema, data: z.record(z.string(), z.unknown()) },
     }, (args) => executeTool(args, (ctx, client) => maybeWrite(ctx, client, "POST", `/crm/v3/objects/${objectType}/batch/archive`, args.data)));
@@ -226,7 +250,14 @@ export function registerHubSpotTools(server) {
     for (const objectType of ENGAGEMENT_OBJECT_TYPES) {
         registerStandardObjectTools(server, objectType);
     }
-    server.registerTool("crm_properties_list", {
+    // HubSpot Remote MCP drop-in compatibility layer — agents built against
+    // https://mcp.hubspot.com can target `hscli mcp` unchanged.
+    registerHubspotCompatTools(server);
+    // Extension surface — MCP tools that HubSpot's hosted server doesn't
+    // expose (workflows, files, forms, webhooks, marketing-emails, CMS writes,
+    // conversations).
+    registerExtensionTools(server);
+    registerMcpTool(server, "crm_properties_list", {
         description: "List properties for an object type",
         inputSchema: { ...baseArgsSchema, objectType: z.enum(PROPERTY_OBJECT_TYPES) },
     }, (args) => executeTool(args, (_ctx, client) => {
@@ -234,7 +265,7 @@ export function registerHubSpotTools(server) {
         const objectTypeSegment = encodePathSegment(objectTypeValue, "objectType");
         return client.request(`/crm/v3/properties/${objectTypeSegment}`);
     }));
-    server.registerTool("crm_properties_get", {
+    registerMcpTool(server, "crm_properties_get", {
         description: "Get one property definition",
         inputSchema: { ...baseArgsSchema, objectType: z.enum(PROPERTY_OBJECT_TYPES), propertyName: z.string().min(1) },
     }, (args) => executeTool(args, (_ctx, client) => {
@@ -243,7 +274,7 @@ export function registerHubSpotTools(server) {
         const propertyNameSegment = encodePathSegment(args.propertyName, "propertyName");
         return client.request(`/crm/v3/properties/${objectTypeSegment}/${propertyNameSegment}`);
     }));
-    server.registerTool("crm_properties_create", {
+    registerMcpTool(server, "crm_properties_create", {
         description: "Create property (dry-run by default unless force=true)",
         inputSchema: { ...baseArgsSchema, objectType: z.enum(PROPERTY_OBJECT_TYPES), data: z.record(z.string(), z.unknown()) },
     }, (args) => executeTool(args, (ctx, client) => {
@@ -251,7 +282,7 @@ export function registerHubSpotTools(server) {
         const objectTypeSegment = encodePathSegment(objectTypeValue, "objectType");
         return maybeWrite(ctx, client, "POST", `/crm/v3/properties/${objectTypeSegment}`, args.data);
     }));
-    server.registerTool("crm_properties_update", {
+    registerMcpTool(server, "crm_properties_update", {
         description: "Update property (dry-run by default unless force=true)",
         inputSchema: {
             ...baseArgsSchema,
@@ -265,7 +296,7 @@ export function registerHubSpotTools(server) {
         const propertyNameSegment = encodePathSegment(args.propertyName, "propertyName");
         return maybeWrite(ctx, client, "PATCH", `/crm/v3/properties/${objectTypeSegment}/${propertyNameSegment}`, args.data);
     }));
-    server.registerTool("crm_associations_list", {
+    registerMcpTool(server, "crm_associations_list", {
         description: "List associations between CRM objects (supports standard types, engagements, and custom object type IDs like 2-199622513)",
         inputSchema: {
             ...baseArgsSchema,
@@ -284,7 +315,7 @@ export function registerHubSpotTools(server) {
         appendOptional(params, "after", args.after);
         return client.request(`/crm/v4/objects/${fromObjectTypeSegment}/${fromObjectIdSegment}/associations/${toObjectTypeSegment}?${params.toString()}`);
     }));
-    server.registerTool("crm_associations_create", {
+    registerMcpTool(server, "crm_associations_create", {
         description: "Create default association (dry-run by default unless force=true). Supports standard types, engagements, and custom object type IDs.",
         inputSchema: {
             ...baseArgsSchema,
@@ -296,7 +327,7 @@ export function registerHubSpotTools(server) {
     }, (args) => executeTool(args, (ctx, client) => {
         return maybeWrite(ctx, client, "PUT", `/crm/v4/objects/${encodePathSegment(args.fromObjectType.trim().toLowerCase(), "fromObjectType")}/${encodePathSegment(args.fromObjectId, "fromObjectId")}/associations/default/${encodePathSegment(args.toObjectType.trim().toLowerCase(), "toObjectType")}/${encodePathSegment(args.toObjectId, "toObjectId")}`);
     }));
-    server.registerTool("crm_associations_remove", {
+    registerMcpTool(server, "crm_associations_remove", {
         description: "Remove default association (dry-run by default unless force=true). Supports standard types, engagements, and custom object type IDs.",
         inputSchema: {
             ...baseArgsSchema,
@@ -308,11 +339,11 @@ export function registerHubSpotTools(server) {
     }, (args) => executeTool(args, (ctx, client) => {
         return maybeWrite(ctx, client, "DELETE", `/crm/v4/objects/${encodePathSegment(args.fromObjectType.trim().toLowerCase(), "fromObjectType")}/${encodePathSegment(args.fromObjectId, "fromObjectId")}/associations/default/${encodePathSegment(args.toObjectType.trim().toLowerCase(), "toObjectType")}/${encodePathSegment(args.toObjectId, "toObjectId")}`);
     }));
-    server.registerTool("crm_imports_create", {
+    registerMcpTool(server, "crm_imports_create", {
         description: "Create import (dry-run by default unless force=true)",
         inputSchema: { ...baseArgsSchema, data: z.record(z.string(), z.unknown()) },
     }, (args) => executeTool(args, (ctx, client) => maybeWrite(ctx, client, "POST", "/crm/v3/imports", args.data)));
-    server.registerTool("crm_imports_list", {
+    registerMcpTool(server, "crm_imports_list", {
         description: "List import jobs",
         inputSchema: { ...baseArgsSchema, limit: z.number().int().positive().default(100), after: z.string().optional() },
     }, (args) => executeTool(args, (_ctx, client) => {
@@ -321,21 +352,21 @@ export function registerHubSpotTools(server) {
         appendOptional(params, "after", args.after);
         return client.request(`/crm/v3/imports?${params.toString()}`);
     }));
-    server.registerTool("crm_imports_get", {
+    registerMcpTool(server, "crm_imports_get", {
         description: "Get import by ID",
         inputSchema: { ...baseArgsSchema, importId: z.string().min(1) },
     }, (args) => executeTool(args, (_ctx, client) => {
         const importIdSegment = encodePathSegment(args.importId, "importId");
         return client.request(`/crm/v3/imports/${importIdSegment}`);
     }));
-    server.registerTool("crm_imports_errors", {
+    registerMcpTool(server, "crm_imports_errors", {
         description: "Get import errors",
         inputSchema: { ...baseArgsSchema, importId: z.string().min(1) },
     }, (args) => executeTool(args, (_ctx, client) => {
         const importIdSegment = encodePathSegment(args.importId, "importId");
         return client.request(`/crm/v3/imports/${importIdSegment}/errors`);
     }));
-    server.registerTool("crm_owners_list", {
+    registerMcpTool(server, "crm_owners_list", {
         description: "List HubSpot owners",
         inputSchema: {
             ...baseArgsSchema,
@@ -350,23 +381,23 @@ export function registerHubSpotTools(server) {
         appendOptional(params, "email", args.email);
         return client.request(`/crm/v3/owners/?${params.toString()}`);
     }));
-    server.registerTool("crm_custom_schemas_list", {
+    registerMcpTool(server, "crm_custom_schemas_list", {
         description: "List custom object schemas",
         inputSchema: { ...baseArgsSchema },
     }, (args) => executeTool(args, (_ctx, client) => client.request("/crm/v3/schemas")));
-    server.registerTool("crm_custom_schemas_get", {
+    registerMcpTool(server, "crm_custom_schemas_get", {
         description: "Get custom object schema by objectType",
         inputSchema: { ...baseArgsSchema, objectType: z.string().min(1) },
     }, (args) => executeTool(args, (_ctx, client) => client.request(`/crm/v3/schemas/${encodePathSegment(args.objectType, "objectType")}`)));
-    server.registerTool("crm_custom_schemas_create", {
+    registerMcpTool(server, "crm_custom_schemas_create", {
         description: "Create custom object schema (dry-run by default unless force=true)",
         inputSchema: { ...baseArgsSchema, data: z.record(z.string(), z.unknown()) },
     }, (args) => executeTool(args, (ctx, client) => maybeWrite(ctx, client, "POST", "/crm/v3/schemas", args.data)));
-    server.registerTool("crm_custom_schemas_update", {
+    registerMcpTool(server, "crm_custom_schemas_update", {
         description: "Update custom object schema (dry-run by default unless force=true)",
         inputSchema: { ...baseArgsSchema, objectType: z.string().min(1), data: z.record(z.string(), z.unknown()) },
     }, (args) => executeTool(args, (ctx, client) => maybeWrite(ctx, client, "PATCH", `/crm/v3/schemas/${encodePathSegment(args.objectType, "objectType")}`, args.data)));
-    server.registerTool("crm_custom_records_list", {
+    registerMcpTool(server, "crm_custom_records_list", {
         description: "List custom object records by objectType",
         inputSchema: { ...baseArgsSchema, objectType: z.string().min(1), limit: z.number().int().positive().default(50), after: z.string().optional() },
     }, (args) => executeTool(args, async (ctx, client) => {
@@ -378,7 +409,7 @@ export function registerHubSpotTools(server) {
         enrichCustomListResponse(res, portal, args.objectType);
         return res;
     }));
-    server.registerTool("crm_custom_records_get", {
+    registerMcpTool(server, "crm_custom_records_get", {
         description: "Get custom object record by objectType and id",
         inputSchema: { ...baseArgsSchema, objectType: z.string().min(1), id: z.string().min(1) },
     }, (args) => executeTool(args, async (ctx, client) => {
@@ -388,7 +419,7 @@ export function registerHubSpotTools(server) {
             enrichCustomRecordUrl(res, portal, args.objectType);
         return res;
     }));
-    server.registerTool("crm_custom_records_search", {
+    registerMcpTool(server, "crm_custom_records_search", {
         description: "Search custom object records",
         inputSchema: { ...baseArgsSchema, objectType: z.string().min(1), data: z.record(z.string(), z.unknown()) },
     }, (args) => executeTool(args, async (ctx, client) => {
@@ -397,7 +428,7 @@ export function registerHubSpotTools(server) {
         enrichCustomListResponse(res, portal, args.objectType);
         return res;
     }));
-    server.registerTool("crm_custom_records_create", {
+    registerMcpTool(server, "crm_custom_records_create", {
         description: "Create custom object record (dry-run by default unless force=true)",
         inputSchema: { ...baseArgsSchema, objectType: z.string().min(1), data: z.record(z.string(), z.unknown()) },
     }, (args) => executeTool(args, async (ctx, client) => {
@@ -407,7 +438,7 @@ export function registerHubSpotTools(server) {
             enrichCustomRecordUrl(res, portal, args.objectType);
         return res;
     }));
-    server.registerTool("crm_custom_records_update", {
+    registerMcpTool(server, "crm_custom_records_update", {
         description: "Update custom object record (dry-run by default unless force=true)",
         inputSchema: { ...baseArgsSchema, objectType: z.string().min(1), id: z.string().min(1), data: z.record(z.string(), z.unknown()) },
     }, (args) => executeTool(args, async (ctx, client) => {
@@ -417,11 +448,11 @@ export function registerHubSpotTools(server) {
             enrichCustomRecordUrl(res, portal, args.objectType);
         return res;
     }));
-    server.registerTool("crm_custom_records_delete", {
+    registerMcpTool(server, "crm_custom_records_delete", {
         description: "Delete custom object record (dry-run by default unless force=true)",
         inputSchema: { ...baseArgsSchema, objectType: z.string().min(1), id: z.string().min(1) },
     }, (args) => executeTool(args, (ctx, client) => maybeWrite(ctx, client, "DELETE", `/crm/v3/objects/${encodePathSegment(args.objectType, "objectType")}/${encodePathSegment(args.id, "id")}`)));
-    server.registerTool("crm_pipelines_list", {
+    registerMcpTool(server, "crm_pipelines_list", {
         description: "List pipelines for object type",
         inputSchema: { ...baseArgsSchema, objectType: z.enum(PIPELINE_OBJECT_TYPES) },
     }, (args) => executeTool(args, (_ctx, client) => {
@@ -429,7 +460,7 @@ export function registerHubSpotTools(server) {
         const objectTypeSegment = encodePathSegment(objectTypeValue, "objectType");
         return client.request(`/crm/v3/pipelines/${objectTypeSegment}`);
     }));
-    server.registerTool("crm_pipelines_get", {
+    registerMcpTool(server, "crm_pipelines_get", {
         description: "Get one pipeline",
         inputSchema: { ...baseArgsSchema, objectType: z.enum(PIPELINE_OBJECT_TYPES), pipelineId: z.string().min(1) },
     }, (args) => executeTool(args, (_ctx, client) => {
@@ -438,7 +469,7 @@ export function registerHubSpotTools(server) {
         const pipelineIdSegment = encodePathSegment(args.pipelineId, "pipelineId");
         return client.request(`/crm/v3/pipelines/${objectTypeSegment}/${pipelineIdSegment}`);
     }));
-    server.registerTool("hub_api_request", {
+    registerMcpTool(server, "hub_api_request", {
         description: "Raw HubSpot API request with safety controls",
         inputSchema: {
             ...baseArgsSchema,
@@ -454,7 +485,7 @@ export function registerHubSpotTools(server) {
         return maybeWrite(ctx, client, method, args.path, args.data);
     }));
     // ── Lists ──────────────────────────────────────────────────────────────
-    server.registerTool("crm_lists_list", {
+    registerMcpTool(server, "crm_lists_list", {
         description: "List CRM lists with pagination",
         inputSchema: {
             ...baseArgsSchema,
@@ -470,7 +501,7 @@ export function registerHubSpotTools(server) {
         const qs = params.toString();
         return await client.request(`/crm/v3/lists${qs ? `?${qs}` : ""}`);
     }));
-    server.registerTool("crm_lists_get", {
+    registerMcpTool(server, "crm_lists_get", {
         description: "Get a CRM list by ID",
         inputSchema: {
             ...baseArgsSchema,
@@ -480,7 +511,7 @@ export function registerHubSpotTools(server) {
         const listIdSegment = encodePathSegment(args.listId, "listId");
         return await client.request(`/crm/v3/lists/${listIdSegment}`);
     }));
-    server.registerTool("crm_lists_create", {
+    registerMcpTool(server, "crm_lists_create", {
         description: "Create a CRM list (dry-run by default unless force=true)",
         inputSchema: {
             ...baseArgsSchema,
@@ -489,7 +520,7 @@ export function registerHubSpotTools(server) {
     }, (args) => executeTool(args, (ctx, client) => {
         return maybeWrite(ctx, client, "POST", "/crm/v3/lists", args.data);
     }));
-    server.registerTool("crm_lists_update", {
+    registerMcpTool(server, "crm_lists_update", {
         description: "Update a CRM list (dry-run by default unless force=true)",
         inputSchema: {
             ...baseArgsSchema,
@@ -500,7 +531,7 @@ export function registerHubSpotTools(server) {
         const listIdSegment = encodePathSegment(args.listId, "listId");
         return maybeWrite(ctx, client, "PATCH", `/crm/v3/lists/${listIdSegment}`, args.data);
     }));
-    server.registerTool("crm_lists_delete", {
+    registerMcpTool(server, "crm_lists_delete", {
         description: "Delete a CRM list (dry-run by default unless force=true)",
         inputSchema: {
             ...baseArgsSchema,
@@ -510,7 +541,7 @@ export function registerHubSpotTools(server) {
         const listIdSegment = encodePathSegment(args.listId, "listId");
         return maybeWrite(ctx, client, "DELETE", `/crm/v3/lists/${listIdSegment}`);
     }));
-    server.registerTool("crm_lists_memberships", {
+    registerMcpTool(server, "crm_lists_memberships", {
         description: "Get memberships of a CRM list",
         inputSchema: {
             ...baseArgsSchema,
@@ -521,7 +552,7 @@ export function registerHubSpotTools(server) {
         return await client.request(`/crm/v3/lists/${listIdSegment}/memberships`);
     }));
     // ── Sequences ──────────────────────────────────────────────────────────
-    server.registerTool("sales_sequences_list", {
+    registerMcpTool(server, "sales_sequences_list", {
         description: "List sales sequences with pagination",
         inputSchema: {
             ...baseArgsSchema,
@@ -537,7 +568,7 @@ export function registerHubSpotTools(server) {
         const qs = params.toString();
         return await client.request(`/automation/v4/sequences${qs ? `?${qs}` : ""}`);
     }));
-    server.registerTool("sales_sequences_get", {
+    registerMcpTool(server, "sales_sequences_get", {
         description: "Get a sales sequence by ID",
         inputSchema: {
             ...baseArgsSchema,
@@ -547,7 +578,7 @@ export function registerHubSpotTools(server) {
         const sequenceIdSegment = encodePathSegment(args.sequenceId, "sequenceId");
         return await client.request(`/automation/v4/sequences/${sequenceIdSegment}`);
     }));
-    server.registerTool("sales_sequences_enrollments", {
+    registerMcpTool(server, "sales_sequences_enrollments", {
         description: "Get enrollments for a sales sequence",
         inputSchema: {
             ...baseArgsSchema,
@@ -558,7 +589,7 @@ export function registerHubSpotTools(server) {
         return await client.request(`/automation/v4/sequences/${sequenceIdSegment}/enrollments`);
     }));
     // ── Reporting ──────────────────────────────────────────────────────────
-    server.registerTool("reporting_dashboards_list", {
+    registerMcpTool(server, "reporting_dashboards_list", {
         description: "List analytics reports/dashboards with pagination",
         inputSchema: {
             ...baseArgsSchema,
@@ -574,7 +605,7 @@ export function registerHubSpotTools(server) {
         const qs = params.toString();
         return await client.request(`/analytics/v2/reports${qs ? `?${qs}` : ""}`);
     }));
-    server.registerTool("reporting_dashboards_get", {
+    registerMcpTool(server, "reporting_dashboards_get", {
         description: "Get an analytics report/dashboard by ID",
         inputSchema: {
             ...baseArgsSchema,
@@ -585,7 +616,7 @@ export function registerHubSpotTools(server) {
         return await client.request(`/analytics/v2/reports/${dashboardIdSegment}`);
     }));
     // ── Exports ────────────────────────────────────────────────────────────
-    server.registerTool("crm_exports_create", {
+    registerMcpTool(server, "crm_exports_create", {
         description: "Create a CRM export (dry-run by default unless force=true)",
         inputSchema: {
             ...baseArgsSchema,
@@ -594,7 +625,7 @@ export function registerHubSpotTools(server) {
     }, (args) => executeTool(args, (ctx, client) => {
         return maybeWrite(ctx, client, "POST", "/crm/v3/exports", args.data);
     }));
-    server.registerTool("crm_exports_list", {
+    registerMcpTool(server, "crm_exports_list", {
         description: "List CRM exports with pagination",
         inputSchema: {
             ...baseArgsSchema,
@@ -610,7 +641,7 @@ export function registerHubSpotTools(server) {
         const qs = params.toString();
         return await client.request(`/crm/v3/exports${qs ? `?${qs}` : ""}`);
     }));
-    server.registerTool("crm_exports_get", {
+    registerMcpTool(server, "crm_exports_get", {
         description: "Get a CRM export by ID",
         inputSchema: {
             ...baseArgsSchema,
@@ -620,7 +651,7 @@ export function registerHubSpotTools(server) {
         const exportIdSegment = encodePathSegment(args.exportId, "exportId");
         return await client.request(`/crm/v3/exports/${exportIdSegment}`);
     }));
-    server.registerTool("crm_exports_status", {
+    registerMcpTool(server, "crm_exports_status", {
         description: "Get the status of a CRM export",
         inputSchema: {
             ...baseArgsSchema,
@@ -631,7 +662,7 @@ export function registerHubSpotTools(server) {
         return await client.request(`/crm/v3/exports/${exportIdSegment}/status`);
     }));
     // ── Pipeline Stages ────────────────────────────────────────────────────
-    server.registerTool("crm_pipelines_stages", {
+    registerMcpTool(server, "crm_pipelines_stages", {
         description: "List stages for a pipeline",
         inputSchema: {
             ...baseArgsSchema,
@@ -645,7 +676,7 @@ export function registerHubSpotTools(server) {
         return client.request(`/crm/v3/pipelines/${objectTypeSegment}/${pipelineIdSegment}/stages`);
     }));
     // ── Property Groups ────────────────────────────────────────────────────
-    server.registerTool("crm_property_groups_list", {
+    registerMcpTool(server, "crm_property_groups_list", {
         description: "List property groups for an object type",
         inputSchema: {
             ...baseArgsSchema,
@@ -656,7 +687,7 @@ export function registerHubSpotTools(server) {
         const objectTypeSegment = encodePathSegment(objectTypeValue, "objectType");
         return client.request(`/crm/v3/properties/${objectTypeSegment}/groups`);
     }));
-    server.registerTool("crm_property_groups_create", {
+    registerMcpTool(server, "crm_property_groups_create", {
         description: "Create a property group (dry-run by default unless force=true)",
         inputSchema: {
             ...baseArgsSchema,
@@ -668,7 +699,7 @@ export function registerHubSpotTools(server) {
         const objectTypeSegment = encodePathSegment(objectTypeValue, "objectType");
         return maybeWrite(ctx, client, "POST", `/crm/v3/properties/${objectTypeSegment}/groups`, args.data);
     }));
-    server.registerTool("crm_property_groups_update", {
+    registerMcpTool(server, "crm_property_groups_update", {
         description: "Update a property group (dry-run by default unless force=true)",
         inputSchema: {
             ...baseArgsSchema,