@ascendkit/cli 0.2.0 → 0.3.0

package/dist/tools/campaigns.js

@@ -0,0 +1,78 @@
+import { z } from "zod";
+import * as campaigns from "../commands/campaigns.js";
+export function registerCampaignTools(server, client) {
+    server.tool("campaign_create", "Create a new email campaign targeting users that match an audience filter. Campaigns start as drafts; set scheduledAt to schedule for future delivery. Campaign lifecycle: create → preview audience → schedule → sending → sent.", {
+        name: z.string().describe("Campaign name, e.g. 'March Newsletter'"),
+        templateId: z.string().describe("Email template ID (tpl_ prefixed) to use for the campaign"),
+        audienceFilter: z
+            .record(z.unknown())
+            .describe("Filter object to select target users (e.g. { tags: { $in: ['premium'] } }). Allowed fields: createdAt, emailVerified, lastLoginAt, tags, stage, name, email, waitlistStatus, metadata.*"),
+        scheduledAt: z
+            .string()
+            .optional()
+            .describe("ISO 8601 datetime to schedule sending (omit to keep as draft)"),
+        fromIdentityEmail: z
+            .string()
+            .optional()
+            .describe("Verified email identity to use as sender. Falls back to environment default."),
+    }, async (params) => {
+        const data = await campaigns.createCampaign(client, params);
+        return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
+    });
+    server.tool("campaign_list", "List campaigns for the current project. Optionally filter by status: draft, scheduled, sending, sent, failed, or cancelled.", {
+        status: z
+            .enum(["draft", "scheduled", "sending", "sent", "failed", "cancelled"])
+            .optional()
+            .describe("Filter by campaign status"),
+    }, async (params) => {
+        const data = await campaigns.listCampaigns(client, params.status);
+        return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
+    });
+    server.tool("campaign_get", "Get full details of a campaign including its status, template, audience filter, and schedule.", {
+        campaignId: z.string().describe("Campaign ID (cmp_ prefixed)"),
+    }, async (params) => {
+        const data = await campaigns.getCampaign(client, params.campaignId);
+        return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
+    });
+    server.tool("campaign_update", "Update a draft, scheduled, or failed campaign. You can change the name, template, audience filter, or schedule. Only provided fields are updated.", {
+        campaignId: z.string().describe("Campaign ID (cmp_ prefixed)"),
+        name: z.string().optional().describe("New campaign name"),
+        templateId: z.string().optional().describe("New email template ID (tpl_ prefixed)"),
+        audienceFilter: z
+            .record(z.unknown())
+            .optional()
+            .describe("New audience filter object"),
+        scheduledAt: z
+            .string()
+            .optional()
+            .describe("New scheduled send time (ISO 8601 datetime)"),
+        fromIdentityEmail: z
+            .string()
+            .optional()
+            .describe("Verified email identity to use as sender. Falls back to environment default."),
+    }, async (params) => {
+        const { campaignId, ...rest } = params;
+        const data = await campaigns.updateCampaign(client, campaignId, rest);
+        return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
+    });
+    server.tool("campaign_delete", "Delete a draft or failed campaign, or cancel a scheduled/sending campaign. Sent campaigns cannot be deleted.", {
+        campaignId: z.string().describe("Campaign ID (cmp_ prefixed)"),
+    }, async (params) => {
+        const data = await campaigns.deleteCampaign(client, params.campaignId);
+        return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
+    });
+    server.tool("campaign_preview_audience", "Preview how many users match an audience filter before creating or updating a campaign. Returns the count and a sample of matching users.", {
+        audienceFilter: z
+            .record(z.unknown())
+            .describe("Filter object to preview (e.g. { tags: { $in: ['premium'] } }). Allowed fields: createdAt, emailVerified, lastLoginAt, tags, stage, name, email, waitlistStatus, metadata.*"),
+    }, async (params) => {
+        const data = await campaigns.previewAudience(client, params.audienceFilter);
+        return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
+    });
+    server.tool("campaign_analytics", "Get campaign performance analytics: delivery stats (sent, failed, bounced), engagement metrics (opened, clicked), and calculated rates.", {
+        campaignId: z.string().describe("Campaign ID (cmp_ prefixed)"),
+    }, async (params) => {
+        const data = await campaigns.getCampaignAnalytics(client, params.campaignId);
+        return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
+    });
+}

package/dist/tools/content.js

@@ -1,7 +1,19 @@
 import { z } from "zod";
 import * as content from "../commands/content.js";
+function formatTemplateSummary(data) {
+    const lines = [`Template: ${data.name} (${data.id})`];
+    if (data.slug)
+        lines.push(`Slug: ${data.slug}`);
+    lines.push(`Subject: ${data.subject ?? "-"}`);
+    if (data.currentVersion != null)
+        lines.push(`Version: ${data.currentVersion}`);
+    if (Array.isArray(data.variables) && data.variables.length > 0) {
+        lines.push(`Variables: ${data.variables.join(", ")}`);
+    }
+    return lines.join("\n");
+}
 export function registerContentTools(server, client) {
-    server.tool("content_create_template", "Create a new email content template with HTML and plain-text versions. Supports {{variable}} placeholders.", {
+    server.tool("template_create", "Create a new email content template with HTML and plain-text versions. Supports {{variable}} placeholders.", {
         name: z.string().describe("Template name, e.g. 'welcome-email'"),
         subject: z.string().describe("Email subject line"),
         bodyHtml: z.string().describe("HTML email body. Use {{variable}} for placeholders"),
@@ -10,9 +22,9 @@ export function registerContentTools(server, client) {
         description: z.string().optional().describe("Template description"),
     }, async (params) => {
         const data = await content.createTemplate(client, params);
-        return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
+        return { content: [{ type: "text", text: formatTemplateSummary(data) }] };
     });
-    server.tool("content_list_templates", "List all content templates for the current project", {
+    server.tool("template_list", "List all content templates for the current project", {
         query: z.string().optional().describe("Search templates by name, slug, or description"),
         isSystem: z.boolean().optional().describe("Filter: true for system templates, false for custom"),
     }, async (params) => {
@@ -22,13 +34,13 @@ export function registerContentTools(server, client) {
         const data = await content.listTemplates(client, listParams);
         return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
     });
-    server.tool("content_get_template", "Get a content template by ID, including current version body and variables", {
+    server.tool("template_show", "Get a content template by ID, including current version body and variables", {
         templateId: z.string().describe("Template ID (tpl_ prefixed)"),
     }, async (params) => {
         const data = await content.getTemplate(client, params.templateId);
-        return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
+        return { content: [{ type: "text", text: formatTemplateSummary(data) }] };
     });
-    server.tool("content_update_template", "Update a content template. Creates a new immutable version — previous versions are preserved for result tracking.", {
+    server.tool("template_update", "Update a content template. Creates a new immutable version — previous versions are preserved for result tracking.", {
         templateId: z.string().describe("Template ID (tpl_ prefixed)"),
         subject: z.string().optional().describe("New email subject line"),
         bodyHtml: z.string().optional().describe("New HTML email body"),
@@ -40,21 +52,21 @@ export function registerContentTools(server, client) {
     }, async (params) => {
         const { templateId, ...rest } = params;
         const data = await content.updateTemplate(client, templateId, rest);
-        return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
+        return { content: [{ type: "text", text: formatTemplateSummary(data) }] };
     });
-    server.tool("content_delete_template", "Delete a content template and all its versions", {
+    server.tool("template_remove", "Delete a content template and all its versions", {
         templateId: z.string().describe("Template ID (tpl_ prefixed)"),
     }, async (params) => {
-        const data = await content.deleteTemplate(client, params.templateId);
-        return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
+        await content.deleteTemplate(client, params.templateId);
+        return { content: [{ type: "text", text: `Removed template ${params.templateId}.` }] };
     });
-    server.tool("content_list_versions", "List all versions of a content template (newest first)", {
+    server.tool("template_version_list", "List all versions of a content template (newest first)", {
         templateId: z.string().describe("Template ID (tpl_ prefixed)"),
     }, async (params) => {
         const data = await content.listVersions(client, params.templateId);
         return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
     });
-    server.tool("content_get_version", "Get a specific version of a content template", {
+    server.tool("template_version_show", "Get a specific version of a content template", {
         templateId: z.string().describe("Template ID (tpl_ prefixed)"),
         versionNumber: z.number().describe("Version number to retrieve"),
     }, async (params) => {

package/dist/tools/email.js

@@ -1,23 +1,12 @@
 import { z } from "zod";
 import * as email from "../commands/email.js";
 export function registerEmailTools(server, client) {
-    server.tool("email_get_settings", "Get email settings (sender address, domain, verification status)", {}, async () => {
+    server.tool("email_identity_show", "Get email domain and sender identity settings for the current environment", {}, async () => {
         const data = await email.getSettings(client);
         return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
     });
-    server.tool("email_update_settings", "Update email sender settings (fromEmail, fromName)", {
-        fromEmail: z.string().optional().describe("Sender email address"),
-        fromName: z.string().optional().describe("Sender display name"),
-    }, async (params) => {
-        const data = await email.updateSettings(client, params);
-        return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
-    });
-    server.tool("email_setup_domain", "Initiate domain verification for email sending. Returns DNS records, detected DNS provider details, and guided setup links.", {
+    server.tool("email_identity_setup_domain", "Initiate domain verification for email sending. Returns DNS records, detected DNS provider details, and guided setup links.", {
         domain: z.string().describe("Domain to verify (e.g. 'myapp.com')"),
-        dnsProvider: z
-            .string()
-            .optional()
-            .describe("Optional preferred DNS provider hint, e.g. 'cloudflare'."),
     }, async (params) => {
         const data = await email.setupDomain(client, params.domain);
         // Manual DNS setup — show records for copy-paste
@@ -36,22 +25,63 @@ export function registerEmailTools(server, client) {
         return {
             content: [{
                     type: "text",
-                    text: `Domain ${params.domain} identity created in SES.\n\n${providerLine}${portalLine}${guidedLine}\nAdd these DNS records to your domain:\n${formatted}\n\nAfter adding the records, use email_check_domain_status to poll for verification.`,
+                    text: `Domain ${params.domain} identity created in SES.\n\n${providerLine}${portalLine}${guidedLine}\nAdd these DNS records to your domain:\n${formatted}\n\nAfter adding the records, use email_identity_status to poll for verification.`,
                 }],
         };
     });
-    server.tool("email_get_dns_provider", "Detect DNS provider for a domain and return provider dashboard links", {
+    server.tool("email_identity_check_dns", "Check the configured email DNS records against public DNS", {}, async () => {
+        const data = await email.checkDnsRecords(client);
+        return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
+    });
+    server.tool("email_identity_dns_provider", "Detect DNS provider for a domain and return provider dashboard links", {
         domain: z.string().optional().describe("Domain to detect; defaults to configured email domain"),
     }, async (params) => {
         const data = await email.getDnsProvider(client, params.domain);
         return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
     });
-    server.tool("email_check_domain_status", "Poll SES verification status for your configured domain", {}, async () => {
+    server.tool("email_identity_status", "Poll SES verification status for your configured domain", {}, async () => {
         const data = await email.checkDomainStatus(client);
         return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
     });
-    server.tool("email_remove_domain", "Remove domain and reset to default AscendKit sender", {}, async () => {
+    server.tool("email_identity_remove_domain", "Remove domain and reset to default AscendKit sender", {}, async () => {
         const data = await email.removeDomain(client);
         return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
     });
+    server.tool("email_identity_list", "List sender identities for the current environment and refresh their SES verification status", {}, async () => {
+        const data = await email.listIdentities(client);
+        return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
+    });
+    server.tool("email_identity_add", "Add a sender email identity and request SES inbox verification if needed", {
+        email: z.string().describe("Email identity to add, e.g. 'hello@myapp.com'"),
+        displayName: z.string().optional().describe("Optional display name for this sender"),
+    }, async (params) => {
+        const data = await email.createIdentity(client, params);
+        return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
+    });
+    server.tool("email_identity_resend", "Request SES to resend inbox verification for a pending sender identity", {
+        email: z.string().describe("Sender identity email"),
+    }, async (params) => {
+        const data = await email.resendIdentityVerification(client, params.email);
+        return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
+    });
+    server.tool("email_identity_set_default", "Set the default sender identity for this environment", {
+        email: z.string().describe("Sender identity email"),
+        displayName: z.string().optional().describe("Optional updated display name"),
+    }, async (params) => {
+        const data = await email.setDefaultIdentity(client, params);
+        return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
+    });
+    server.tool("email_identity_remove", "Remove a sender identity from this environment", {
+        email: z.string().describe("Sender identity email"),
+    }, async (params) => {
+        const data = await email.removeIdentity(client, params.email);
+        return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
+    });
+    server.tool("email_identity_test", "Send a test email from the selected verified identity", {
+        to: z.string().describe("Recipient address for the test email"),
+        fromIdentityEmail: z.string().optional().describe("Verified sender identity to use"),
+    }, async (params) => {
+        const data = await email.sendTestEmail(client, params);
+        return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
+    });
 }

package/dist/tools/import.d.ts

@@ -0,0 +1,3 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { AscendKitClient } from "../api/client.js";
+export declare function registerImportTools(server: McpServer, client: AscendKitClient): void;

package/dist/tools/import.js

@@ -0,0 +1,116 @@
+import { z } from "zod";
+import * as importCmd from "../commands/import.js";
+export function registerImportTools(server, client) {
+    server.tool("import_clerk", "Import users from Clerk into the current AscendKit environment. Fetches all users from the Clerk API, transforms them to AscendKit format, and pushes them to the import endpoint. Tags users by auth type: import:needs-password-reset or import:social-only. Use mode='preview' for dry-run or mode='run' to apply changes.", {
+        mode: z
+            .enum(["preview", "run"])
+            .default("preview")
+            .describe("Use 'preview' for dry-run or 'run' to apply changes"),
+        clerkApiKey: z
+            .string()
+            .describe("Clerk secret API key (sk_live_... or sk_test_...)"),
+        clerkInstanceUrl: z
+            .string()
+            .optional()
+            .describe("Custom Clerk API URL (default: https://api.clerk.com)"),
+        importUsers: z
+            .boolean()
+            .optional()
+            .describe("Import users (default: true)"),
+        importSettings: z
+            .boolean()
+            .optional()
+            .describe("Import auth settings — OAuth provider config (default: true)"),
+    }, async (params) => {
+        try {
+            const dryRun = params.mode !== "run";
+            const shouldImportUsers = params.importUsers ?? true;
+            const shouldImportSettings = params.importSettings ?? true;
+            const rawUsers = await importCmd.fetchClerkUsers(params.clerkApiKey, params.clerkInstanceUrl);
+            const users = rawUsers.map(importCmd.transformClerkUser);
+            if (users.length === 0) {
+                return {
+                    content: [{ type: "text", text: "No users found in Clerk." }],
+                };
+            }
+            let totalImported = 0;
+            let totalDuplicates = 0;
+            const allErrors = [];
+            const allWarnings = [];
+            // Import users in batches of 500
+            if (shouldImportUsers) {
+                const batchSize = 500;
+                for (let i = 0; i < users.length; i += batchSize) {
+                    const batch = users.slice(i, i + batchSize);
+                    const result = await importCmd.importUsers(client, {
+                        source: "clerk",
+                        users: batch,
+                        dryRun,
+                    });
+                    totalImported += result.imported;
+                    totalDuplicates += result.duplicates.length;
+                    allErrors.push(...result.errors);
+                    allWarnings.push(...result.warnings);
+                }
+            }
+            // Import auth settings (OAuth provider config)
+            if (shouldImportSettings) {
+                const providers = new Set();
+                for (const u of users) {
+                    for (const p of u.oauthProviders ?? []) {
+                        providers.add(p.providerId);
+                    }
+                }
+                if (providers.size > 0) {
+                    const settingsResult = await importCmd.importUsers(client, {
+                        source: "clerk",
+                        users: [],
+                        authSettings: { enabledProviders: [...providers] },
+                        dryRun,
+                    });
+                    allWarnings.push(...settingsResult.warnings);
+                }
+            }
+            const summary = {
+                fetched: users.length,
+                dryRun,
+                importUsers: shouldImportUsers,
+                importSettings: shouldImportSettings,
+            };
+            if (shouldImportUsers) {
+                summary.imported = totalImported;
+                summary.duplicates = totalDuplicates;
+            }
+            if (allErrors.length > 0)
+                summary.errors = allErrors;
+            if (allWarnings.length > 0)
+                summary.warnings = allWarnings;
+            let text = JSON.stringify(summary, null, 2);
+            if (dryRun) {
+                text += "\n\nThis was a dry run. Use mode='run' to apply changes.";
+            }
+            else if (totalImported > 0) {
+                text += "\n\nTo set up migration emails, use the import_migration_journey_create tool.";
+            }
+            return { content: [{ type: "text", text }] };
+        }
+        catch (err) {
+            return {
+                content: [{
+                        type: "text",
+                        text: `Import failed: ${err instanceof Error ? err.message : String(err)}`,
+                    }],
+                isError: true,
+            };
+        }
+    });
+    server.tool("import_migration_journey_create", "Create pre-built migration email templates and draft journeys for notifying imported users. Creates 5 email templates (announcement, go-live, reminder, password reset, password reset reminder) and 2 journeys: announcement cadence (all users, Day 0/3/7) and password reset cadence (credential users, Day 1/4). Idempotent — skips already-existing templates/journeys.", {
+        fromIdentityEmail: z
+            .string()
+            .optional()
+            .describe("Verified email identity to use as sender for migration emails"),
+    }, async (params) => {
+        const data = await importCmd.instantiateMigrationJourney(client, params.fromIdentityEmail);
+        return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
+    });
+}

package/dist/tools/journeys.js

@@ -3,7 +3,7 @@ import * as journeys from "../commands/journeys.js";
 import { parseDelay } from "../utils/duration.js";
 import { formatJourneyAnalytics, formatJourneyList, formatJourneyWithGuidance, formatNodeList, formatSingleNode, formatTransitionList, formatSingleTransition, } from "../utils/journey-format.js";
 export function registerJourneyTools(server, client) {
-    server.tool("journey_create", "Create a new user lifecycle journey. Journeys start in 'draft' status. Minimal create: just name + entryEvent + entryNode (entry node auto-created as a 'none' action placeholder). Add nodes and transitions incrementally with journey_add_node and journey_add_transition. Lifecycle: create → add nodes/transitions → activate → users enroll on entryEvent.", {
+    server.tool("journey_create", "Create a new user lifecycle journey. Journeys start in 'draft' status. Minimal create: just name + entryEvent + entryNode (entry node auto-created as a 'none' action placeholder). Add nodes and transitions incrementally with journey_node_add and journey_transition_add. Lifecycle: create → add nodes/transitions → activate → users enroll on entryEvent.", {
         name: z.string().describe("Journey name, e.g. 'Onboarding Flow'"),
         entryEvent: z
             .string()
@@ -14,7 +14,7 @@ export function registerJourneyTools(server, client) {
         nodes: z
             .record(z.record(z.unknown()))
             .optional()
-            .describe("Map of node names to definitions. Each node has 'action' ({type, templateSlug?, surveySlug?, tagName?, stageName?}) and optional 'terminal' (boolean). If omitted, the entry node is auto-created as a 'none' action placeholder."),
+            .describe("Map of node names to definitions. Each node has 'action' ({type, templateSlug?, surveySlug?, tagName?, stageName?, fromIdentityEmail?, variables?}) and optional 'terminal' (boolean). If omitted, the entry node is auto-created as a 'none' action placeholder."),
         transitions: z
             .array(z.record(z.unknown()))
             .optional()
@@ -45,7 +45,7 @@ export function registerJourneyTools(server, client) {
         const formatted = formatJourneyList(data);
         return { content: [{ type: "text", text: formatted }] };
     });
-    server.tool("journey_get", "Get a journey by ID with full definition (nodes, transitions) and current stats (enrolled, active, completed).", {
+    server.tool("journey_show", "Get a journey by ID with full definition (nodes, transitions) and current stats (enrolled, active, completed).", {
         journeyId: z.string().describe("Journey ID (jrn_ prefixed)"),
     }, async (params) => {
         const data = await journeys.getJourney(client, params.journeyId);
@@ -69,7 +69,7 @@ export function registerJourneyTools(server, client) {
         nodes: z
             .record(z.record(z.unknown()))
             .optional()
-            .describe("Updated node definitions"),
+            .describe("Updated node definitions. send_email actions may include fromIdentityEmail to override the environment default sender for that node."),
         transitions: z
             .array(z.record(z.unknown()))
             .optional()
@@ -80,7 +80,7 @@ export function registerJourneyTools(server, client) {
         const formatted = formatJourneyWithGuidance(data);
         return { content: [{ type: "text", text: formatted }] };
     });
-    server.tool("journey_delete", "Delete a journey and all associated user states. This is permanent.", {
+    server.tool("journey_remove", "Delete a journey and all associated user states. This is permanent.", {
         journeyId: z.string().describe("Journey ID (jrn_ prefixed)"),
     }, async (params) => {
         await journeys.deleteJourney(client, params.journeyId);
@@ -89,13 +89,20 @@ export function registerJourneyTools(server, client) {
         };
     });
     // --- Lifecycle tools ---
-    server.tool("journey_activate", "Activate a journey (draft → active). Once active, users are automatically enrolled when the entry event fires.", {
+    server.tool("journey_activate", "Activate a draft journey (draft → active). Once active, users are automatically enrolled when the entry event fires.", {
         journeyId: z.string().describe("Journey ID (jrn_ prefixed)"),
     }, async (params) => {
         const data = await journeys.activateJourney(client, params.journeyId);
         const formatted = formatJourneyWithGuidance(data);
         return { content: [{ type: "text", text: formatted }] };
     });
+    server.tool("journey_resume", "Resume a paused journey (paused → active). Transitions continue while paused, and queued actions are drained on resume.", {
+        journeyId: z.string().describe("Journey ID (jrn_ prefixed)"),
+    }, async (params) => {
+        const data = await journeys.resumeJourney(client, params.journeyId);
+        const formatted = formatJourneyWithGuidance(data);
+        return { content: [{ type: "text", text: formatted }] };
+    });
     server.tool("journey_pause", "Pause an active journey. Users stay at their current nodes but actions are queued instead of executed. Transitions still occur.", {
         journeyId: z.string().describe("Journey ID (jrn_ prefixed)"),
     }, async (params) => {
@@ -119,14 +126,14 @@ export function registerJourneyTools(server, client) {
         return { content: [{ type: "text", text: formatted }] };
     });
     // --- Granular node tools ---
-    server.tool("journey_list_nodes", "List all nodes in a journey with their actions, terminal status, and transition counts. Use this to inspect the journey graph before making changes.", {
+    server.tool("journey_node_list", "List all nodes in a journey with their actions, terminal status, and transition counts. Use this to inspect the journey graph before making changes.", {
         journeyId: z.string().describe("Journey ID (jrn_ prefixed)"),
     }, async (params) => {
         const data = await journeys.listNodes(client, params.journeyId);
         const formatted = formatNodeList(data);
         return { content: [{ type: "text", text: formatted }] };
     });
-    server.tool("journey_add_node", "Add a node to a journey. Nodes define what happens at each step: send_email (with optional surveySlug), tag_user, advance_stage, or none (wait/branching). Node name is the stable identifier used in transitions.", {
+    server.tool("journey_node_add", "Add a node to a journey. Nodes define what happens at each step: send_email (with optional surveySlug), tag_user, advance_stage, or none (wait/branching). Node name is the stable identifier used in transitions.", {
         journeyId: z.string().describe("Journey ID (jrn_ prefixed)"),
         name: z
             .string()
@@ -138,6 +145,8 @@ export function registerJourneyTools(server, client) {
             surveySlug: z.string().optional().describe("Survey slug to include in email (for send_email)"),
             tagName: z.string().optional().describe("Tag to add (for tag_user)"),
             stageName: z.string().optional().describe("Stage to set (for advance_stage)"),
+            fromIdentityEmail: z.string().optional().describe("Verified email identity to use when this node sends email"),
+            variables: z.record(z.string()).optional().describe("Custom template variables for this node's email (e.g. {loginUrl: 'https://...', resetUrl: 'https://...'})"),
         })
             .optional()
             .describe("Action to execute when a user enters this node. Defaults to {type: 'none'}."),
@@ -151,7 +160,7 @@ export function registerJourneyTools(server, client) {
         const formatted = formatSingleNode(data, "Added", params.name);
         return { content: [{ type: "text", text: formatted }] };
     });
-    server.tool("journey_edit_node", "Update a node's action or terminal flag by name. Only provided fields are changed. To clear an action, set type to 'none'. Removing templateSlug also removes surveySlug (survey rides on email).", {
+    server.tool("journey_node_update", "Update a node's action or terminal flag by name. Only provided fields are changed. To clear an action, set type to 'none'. Removing templateSlug also removes surveySlug (survey rides on email).", {
         journeyId: z.string().describe("Journey ID (jrn_ prefixed)"),
         nodeName: z.string().describe("Name of the node to edit"),
         action: z
@@ -161,6 +170,8 @@ export function registerJourneyTools(server, client) {
             surveySlug: z.string().optional().describe("Survey slug to include in email"),
             tagName: z.string().optional().describe("Tag to add"),
             stageName: z.string().optional().describe("Stage to set"),
+            fromIdentityEmail: z.string().optional().describe("Verified email identity to use when this node sends email"),
+            variables: z.record(z.string()).optional().describe("Custom template variables for this node's email (e.g. {loginUrl: 'https://...', resetUrl: 'https://...'})"),
         })
             .optional()
             .describe("New action definition (replaces the entire action)"),
@@ -174,7 +185,7 @@ export function registerJourneyTools(server, client) {
         const formatted = formatSingleNode(data, "Updated", nodeName);
         return { content: [{ type: "text", text: formatted }] };
     });
-    server.tool("journey_remove_node", "Remove a node from a journey by name. All transitions to/from this node are automatically deleted (cascade). Users currently at this node are exited. This is permanent.", {
+    server.tool("journey_node_remove", "Remove a node from a journey by name. All transitions to/from this node are automatically deleted (cascade). Users currently at this node are exited. This is permanent.", {
         journeyId: z.string().describe("Journey ID (jrn_ prefixed)"),
         nodeName: z.string().describe("Name of the node to remove"),
     }, async (params) => {
@@ -183,7 +194,7 @@ export function registerJourneyTools(server, client) {
         return { content: [{ type: "text", text: formatted }] };
     });
     // --- Granular transition tools ---
-    server.tool("journey_list_transitions", "List all transitions in a journey. Shows 'from → to' with trigger type (on event / after delay). Filterable by source or target node.", {
+    server.tool("journey_transition_list", "List all transitions in a journey. Shows 'from → to' with trigger type (on event / after delay). Filterable by source or target node.", {
         journeyId: z.string().describe("Journey ID (jrn_ prefixed)"),
         from_node: z.string().optional().describe("Filter by source node name"),
         to_node: z.string().optional().describe("Filter by target node name"),
@@ -193,7 +204,7 @@ export function registerJourneyTools(server, client) {
         const formatted = formatTransitionList(data);
         return { content: [{ type: "text", text: formatted }] };
     });
-    server.tool("journey_add_transition", "Add a transition between two nodes. Use 'on' for event triggers (e.g. on: 'user.login') or 'after' for delays (e.g. after: '3 day', '12 hr', '30 m', '2 week'). Bare numbers default to minutes. Also accepts the structured 'trigger' object. Transition name is auto-generated from '{from}-to-{to}' if not provided.", {
+    server.tool("journey_transition_add", "Add a transition between two nodes. Use 'on' for event triggers (e.g. on: 'user.login') or 'after' for delays (e.g. after: '3 day', '12 hr', '30 m', '2 week'). Bare numbers default to minutes. Also accepts the structured 'trigger' object. Transition name is auto-generated from '{from}-to-{to}' if not provided.", {
         journeyId: z.string().describe("Journey ID (jrn_ prefixed)"),
         from: z.string().describe("Source node name"),
         to: z.string().describe("Target node name"),
@@ -248,7 +259,7 @@ export function registerJourneyTools(server, client) {
         const formatted = formatSingleTransition(data, "Added", transitionName);
         return { content: [{ type: "text", text: formatted }] };
     });
-    server.tool("journey_edit_transition", "Update a transition's trigger or priority by name. Use 'on' for event triggers or 'after' for delays (e.g. '3 day', '12 hr', '30 m'). Also accepts the structured 'trigger' object. Use journey_list_transitions to find transition names.", {
+    server.tool("journey_transition_update", "Update a transition's trigger or priority by name. Use 'on' for event triggers or 'after' for delays (e.g. '3 day', '12 hr', '30 m'). Also accepts the structured 'trigger' object. Use journey_transition_list to find transition names.", {
         journeyId: z.string().describe("Journey ID (jrn_ prefixed)"),
         transitionName: z.string().describe("Name of the transition to edit"),
         on: z
@@ -291,7 +302,7 @@ export function registerJourneyTools(server, client) {
         const formatted = formatSingleTransition(data, "Updated", transitionName);
         return { content: [{ type: "text", text: formatted }] };
     });
-    server.tool("journey_remove_transition", "Remove a transition from a journey by name. This is permanent. Use journey_list_transitions to find transition names.", {
+    server.tool("journey_transition_remove", "Remove a transition from a journey by name. This is permanent. Use journey_transition_list to find transition names.", {
         journeyId: z.string().describe("Journey ID (jrn_ prefixed)"),
         transitionName: z.string().describe("Name of the transition to remove"),
     }, async (params) => {