@ascendkit/cli 0.2.6 → 0.3.1

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.js

@@ -1,7 +1,11 @@
 import { z } from "zod";
 import * as importCmd from "../commands/import.js";
 export function registerImportTools(server, client) {
-    server.tool("auth_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. Defaults to dry-run — pass execute=true to apply changes.", {
+    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_...)"),
@@ -9,10 +13,6 @@ export function registerImportTools(server, client) {
             .string()
             .optional()
             .describe("Custom Clerk API URL (default: https://api.clerk.com)"),
-        execute: z
-            .boolean()
-            .optional()
-            .describe("Set to true to apply changes. Default is dry-run (preview only)."),
         importUsers: z
             .boolean()
             .optional()
@@ -23,7 +23,7 @@ export function registerImportTools(server, client) {
             .describe("Import auth settings — OAuth provider config (default: true)"),
     }, async (params) => {
         try {
-            const dryRun = !(params.execute ?? false);
+            const dryRun = params.mode !== "run";
             const shouldImportUsers = params.importUsers ?? true;
             const shouldImportSettings = params.importSettings ?? true;
             const rawUsers = await importCmd.fetchClerkUsers(params.clerkApiKey, params.clerkInstanceUrl);
@@ -87,10 +87,10 @@ export function registerImportTools(server, client) {
                 summary.warnings = allWarnings;
             let text = JSON.stringify(summary, null, 2);
             if (dryRun) {
-                text += "\n\nThis was a dry run. Pass execute=true to apply changes.";
+                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 journey_create_migration tool.";
+                text += "\n\nTo set up migration emails, use the import_migration_journey_create tool.";
             }
             return { content: [{ type: "text", text }] };
         }
@@ -104,7 +104,7 @@ export function registerImportTools(server, client) {
             };
         }
     });
-    server.tool("journey_create_migration", "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.", {
+    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()

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?, variables?}) 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()
@@ -153,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
@@ -178,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) => {
@@ -187,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"),
@@ -197,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"),
@@ -252,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
@@ -295,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) => {

package/dist/tools/platform.js

@@ -15,13 +15,47 @@ export function registerPlatformTools(server, client) {
             ],
         };
     });
-    server.tool("platform_list_projects", "List all projects in your organization", {}, async () => {
+    server.tool("ascendkit_set_env", "Set the active environment by public key and persist the shared .ascendkit environment context used by both MCP and CLI.", {
+        publicKey: z.string().describe("Environment public key (pk_dev_..., pk_beta_..., or pk_prod_...)"),
+    }, async (params) => {
+        try {
+            const data = await platform.mcpSetEnvironmentByPublicKey(client, params.publicKey);
+            return {
+                content: [{
+                        type: "text",
+                        text: `Active environment: ${data.environment.name} (${data.environment.tier})\n` +
+                            `Project: ${data.project.name}\n` +
+                            `Public key: ${data.environment.publicKey}\n` +
+                            `Updated env files: ${Array.isArray(data.updatedFiles) && data.updatedFiles.length > 0 ? data.updatedFiles.join(", ") : "(none)"}`,
+                    }],
+            };
+        }
+        catch (err) {
+            let message = err instanceof Error ? err.message : String(err);
+            const jsonMatch = message.match(/\{.*\}/s);
+            if (jsonMatch) {
+                try {
+                    const parsed = JSON.parse(jsonMatch[0]);
+                    if (parsed.error)
+                        message = parsed.error;
+                    else if (parsed.detail)
+                        message = parsed.detail;
+                }
+                catch { /* use raw message */ }
+            }
+            return {
+                content: [{ type: "text", text: message }],
+                isError: true,
+            };
+        }
+    });
+    server.tool("project_list", "List all projects in your organization", {}, async () => {
         const data = await platform.mcpListProjects(client);
         return {
             content: [{ type: "text", text: JSON.stringify(data, null, 2) }],
         };
     });
-    server.tool("platform_create_project", "Create a new project in your organization", {
+    server.tool("project_create", "Create a new project in your organization", {
         name: z.string().describe("Project name"),
         description: z.string().optional().describe("Project description"),
         enabledServices: z
@@ -54,7 +88,7 @@ export function registerPlatformTools(server, client) {
             };
         }
     });
-    server.tool("platform_list_environments", "List environments for a project", {
+    server.tool("env_list", "List environments for a project", {
         projectId: z.string().describe("Project ID (prj_ prefixed)"),
     }, async (params) => {
         const data = await platform.mcpListEnvironments(client, params.projectId);
@@ -62,7 +96,7 @@ export function registerPlatformTools(server, client) {
             content: [{ type: "text", text: JSON.stringify(data, null, 2) }],
         };
     });
-    server.tool("platform_create_environment", "Create a new environment for a project. Returns the public key needed for SDK/CLI configuration.", {
+    server.tool("env_create", "Create a new environment for a project. Returns the public key needed for SDK/CLI configuration.", {
         projectId: z.string().describe("Project ID (prj_ prefixed)"),
         name: z
             .string()
@@ -101,7 +135,7 @@ export function registerPlatformTools(server, client) {
             };
         }
     });
-    server.tool("platform_update_environment", "Update an environment's name or description.", {
+    server.tool("env_update", "Update an environment's name or description.", {
         projectId: z.string().describe("Project ID (prj_ prefixed)"),
         environmentId: z.string().describe("Environment ID (env_ prefixed)"),
         name: z.string().optional().describe("New environment name"),
@@ -138,7 +172,7 @@ export function registerPlatformTools(server, client) {
             };
         }
     });
-    server.tool("platform_promote_environment", "Promote an environment's configuration to a higher tier (dev → beta → prod).", {
+    server.tool("env_promote", "Promote an environment's configuration to a higher tier (dev → beta → prod).", {
         environmentId: z.string().describe("Environment ID to promote"),
         targetTier: z
             .string()
@@ -172,10 +206,39 @@ export function registerPlatformTools(server, client) {
             };
         }
     });
-    server.tool("platform_update_environment_variables", "Set environment variables for a project environment. Pass the full variables dict — it replaces all existing variables.", {
-        projectId: z.string().describe("Project ID (prj_ prefixed)"),
-        envId: z.string().describe("Environment ID (env_ prefixed)"),
-        variables: z.record(z.string()).describe("Key-value map of environment variables"),
+    server.tool("keystore_list", "List keystore values for the active environment. Uses the shared .ascendkit environment context by default.", {
+        projectId: z.string().optional().describe("Optional project ID override (defaults to active environment project)"),
+        envId: z.string().optional().describe("Optional environment ID override (defaults to active environment)"),
+    }, async (params) => {
+        try {
+            const env = await platform.mcpGetEnvironment(client, params);
+            const variables = (env.variables ?? {});
+            const entries = Object.entries(variables);
+            const systemVariables = Array.isArray(env.systemVariables)
+                ? env.systemVariables
+                : [];
+            const sections = [];
+            sections.push(entries.length === 0
+                ? "Custom variables:\n(none)"
+                : `Custom variables:\n${entries.map(([key, value]) => `${key}=${value}`).join("\n")}`);
+            if (systemVariables.length > 0) {
+                sections.push(`System variables:\n${systemVariables
+                    .map((item) => `${String(item.key)} = ${String(item.valuePreview)} (${String(item.availability)})`)
+                    .join("\n")}`);
+            }
+            return {
+                content: [{ type: "text", text: sections.join("\n\n") }],
+            };
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            return { content: [{ type: "text", text: message }], isError: true };
+        }
+    });
+    server.tool("keystore_replace", "Replace the full keystore for the active environment. Pass the full key-value map.", {
+        projectId: z.string().optional().describe("Optional project ID override (defaults to active environment project)"),
+        envId: z.string().optional().describe("Optional environment ID override (defaults to active environment)"),
+        variables: z.record(z.string()).describe("Key-value map of keystore values"),
     }, async (params) => {
         try {
             const data = await platform.mcpUpdateEnvironmentVariables(client, params);
@@ -202,4 +265,56 @@ export function registerPlatformTools(server, client) {
             };
         }
     });
+    server.tool("keystore_set", "Set a single keystore key for the active environment.", {
+        projectId: z.string().optional().describe("Optional project ID override (defaults to active environment project)"),
+        envId: z.string().optional().describe("Optional environment ID override (defaults to active environment)"),
+        key: z.string().describe("Keystore key"),
+        value: z.string().describe("Keystore value"),
+    }, async (params) => {
+        try {
+            const env = await platform.mcpGetEnvironment(client, {
+                projectId: params.projectId,
+                envId: params.envId,
+            });
+            const variables = { ...(env.variables ?? {}), [params.key]: params.value };
+            const data = await platform.mcpUpdateEnvironmentVariables(client, {
+                projectId: params.projectId,
+                envId: params.envId,
+                variables,
+            });
+            return {
+                content: [{ type: "text", text: `Saved ${params.key}=${params.value}\n\n${JSON.stringify(data, null, 2)}` }],
+            };
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            return { content: [{ type: "text", text: message }], isError: true };
+        }
+    });
+    server.tool("keystore_remove", "Remove a single keystore key from the active environment.", {
+        projectId: z.string().optional().describe("Optional project ID override (defaults to active environment project)"),
+        envId: z.string().optional().describe("Optional environment ID override (defaults to active environment)"),
+        key: z.string().describe("Keystore key to remove"),
+    }, async (params) => {
+        try {
+            const env = await platform.mcpGetEnvironment(client, {
+                projectId: params.projectId,
+                envId: params.envId,
+            });
+            const variables = { ...(env.variables ?? {}) };
+            delete variables[params.key];
+            const data = await platform.mcpUpdateEnvironmentVariables(client, {
+                projectId: params.projectId,
+                envId: params.envId,
+                variables,
+            });
+            return {
+                content: [{ type: "text", text: `Removed ${params.key}\n\n${JSON.stringify(data, null, 2)}` }],
+            };
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            return { content: [{ type: "text", text: message }], isError: true };
+        }
+    });
 }

package/dist/tools/surveys.js

@@ -2,7 +2,7 @@ import { z } from "zod";
 import * as surveys from "../commands/surveys.js";
 import { formatDistributionResult, formatQuestionList, formatSingleQuestion, formatSurveyList, formatSurveyWithGuidance, } from "../utils/survey-format.js";
 export function registerSurveyTools(server, client) {
-    server.tool("survey_create", "Create a new survey. Use type 'nps' or 'csat' for ready-to-use presets with standard questions, or 'custom' to build from scratch with survey_add_question. Survey lifecycle: create → add questions → activate → distribute → collect → analyze.", {
+    server.tool("survey_create", "Create a new survey. Use type 'nps' or 'csat' for ready-to-use presets with standard questions, or 'custom' to build from scratch with survey_question_add. Survey lifecycle: create → add questions → activate → distribute → collect → analyze.", {
         name: z.string().describe("Survey name, e.g. 'Q1 NPS Survey'"),
         type: z
             .enum(["nps", "csat", "custom"])
@@ -22,7 +22,7 @@ export function registerSurveyTools(server, client) {
         const formatted = formatSurveyList(data);
         return { content: [{ type: "text", text: formatted }] };
     });
-    server.tool("survey_get", "Get a survey by ID with status, question count, response count, and next-step guidance.", {
+    server.tool("survey_show", "Get a survey by ID with status, question count, response count, and next-step guidance.", {
         surveyId: z.string().describe("Survey ID (srv_ prefixed)"),
     }, async (params) => {
         const data = await surveys.getSurvey(client, params.surveyId);
@@ -46,7 +46,7 @@ export function registerSurveyTools(server, client) {
         const formatted = formatSurveyWithGuidance(data);
         return { content: [{ type: "text", text: formatted }] };
     });
-    server.tool("survey_delete", "Delete a survey and all its invitations and responses", {
+    server.tool("survey_remove", "Delete a survey and all its invitations and responses", {
         surveyId: z.string().describe("Survey ID (srv_ prefixed)"),
     }, async (params) => {
         const data = await surveys.deleteSurvey(client, params.surveyId);
@@ -62,7 +62,7 @@ export function registerSurveyTools(server, client) {
         const formatted = formatDistributionResult(data);
         return { content: [{ type: "text", text: formatted }] };
     });
-    server.tool("survey_list_invitations", "List all invitations for a survey with their status (sent/opened/submitted)", {
+    server.tool("survey_invitation_list", "List all invitations for a survey with their status (sent/opened/submitted)", {
         surveyId: z.string().describe("Survey ID (srv_ prefixed)"),
     }, async (params) => {
         const data = await surveys.listInvitations(client, params.surveyId);
@@ -75,14 +75,14 @@ export function registerSurveyTools(server, client) {
         return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
     });
     // --- Question-level management tools ---
-    server.tool("survey_list_questions", "List all questions in a survey in human-readable format. Shows question number, type, title, required status, choices, and any conditional logic.", {
+    server.tool("survey_question_list", "List all questions in a survey in human-readable format. Shows question number, type, title, required status, choices, and any conditional logic.", {
         surveyId: z.string().describe("Survey ID (srv_ prefixed)"),
     }, async (params) => {
         const data = await surveys.listQuestions(client, params.surveyId);
         const formatted = formatQuestionList(data);
         return { content: [{ type: "text", text: formatted }] };
     });
-    server.tool("survey_add_question", "Add a question to a survey. Supported types: text (short text), comment (long text/multi-line), radiogroup (single choice), checkbox (multiple choice), rating (scale — use rateMin:0 rateMax:10 for NPS), boolean (yes/no), dropdown, ranking. For date input, use type 'text' with inputType 'date'. Question name is auto-generated from title if not provided.", {
+    server.tool("survey_question_add", "Add a question to a survey. Supported types: text (short text), comment (long text/multi-line), radiogroup (single choice), checkbox (multiple choice), rating (scale — use rateMin:0 rateMax:10 for NPS), boolean (yes/no), dropdown, ranking. For date input, use type 'text' with inputType 'date'. Question name is auto-generated from title if not provided.", {
         surveyId: z.string().describe("Survey ID (srv_ prefixed)"),
         type: z
             .enum([
@@ -147,7 +147,7 @@ export function registerSurveyTools(server, client) {
         const formatted = formatSingleQuestion(data, "Added");
         return { content: [{ type: "text", text: formatted }] };
     });
-    server.tool("survey_edit_question", "Edit an existing question in a survey by its name. Only provided fields are updated; others remain unchanged. Pass empty string for visibleIf/requiredIf to clear conditional logic.", {
+    server.tool("survey_question_update", "Edit an existing question in a survey by its name. Only provided fields are updated; others remain unchanged. Pass empty string for visibleIf/requiredIf to clear conditional logic.", {
         surveyId: z.string().describe("Survey ID (srv_ prefixed)"),
         questionName: z.string().describe("Name of the question to edit"),
         title: z.string().optional().describe("New question text"),
@@ -181,7 +181,7 @@ export function registerSurveyTools(server, client) {
         const formatted = formatSingleQuestion(data, "Updated");
         return { content: [{ type: "text", text: formatted }] };
     });
-    server.tool("survey_remove_question", "Remove a question from a survey by its name. This is permanent — the question and its configuration are deleted from the survey definition.", {
+    server.tool("survey_question_remove", "Remove a question from a survey by its name. This is permanent — the question and its configuration are deleted from the survey definition.", {
         surveyId: z.string().describe("Survey ID (srv_ prefixed)"),
         questionName: z.string().describe("Name of the question to remove"),
     }, async (params) => {
@@ -195,7 +195,7 @@ export function registerSurveyTools(server, client) {
             ],
         };
     });
-    server.tool("survey_reorder_questions", "Reorder questions in a survey by providing all question names in the desired order. All existing question names must be included.", {
+    server.tool("survey_question_reorder", "Reorder questions in a survey by providing all question names in the desired order. All existing question names must be included.", {
         surveyId: z.string().describe("Survey ID (srv_ prefixed)"),
         order: z
             .array(z.string())

package/dist/utils/correlation.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Correlation IDs for request tracing.
+ *
+ * - `invocationId`      — one UUID per CLI process (lazy-initialized)
+ * - `clientRequestId`   — fresh UUID per outbound HTTP request
+ * - `machineId`         — persisted at ~/.ascendkit/machine-id, generated once
+ */
+export declare function getInvocationId(): string;
+export declare function generateClientRequestId(): string;
+export declare function correlationHeaders(): Record<string, string>;
+export declare function getMachineId(): string;

package/dist/utils/correlation.js

@@ -0,0 +1,67 @@
+/**
+ * Correlation IDs for request tracing.
+ *
+ * - `invocationId`      — one UUID per CLI process (lazy-initialized)
+ * - `clientRequestId`   — fresh UUID per outbound HTTP request
+ * - `machineId`         — persisted at ~/.ascendkit/machine-id, generated once
+ */
+import { randomUUID } from "node:crypto";
+import { readFileSync, writeFileSync, mkdirSync, existsSync } from "node:fs";
+import { join } from "node:path";
+import { homedir } from "node:os";
+// ---------------------------------------------------------------------------
+// Invocation ID — one per process
+// ---------------------------------------------------------------------------
+let _invocationId;
+export function getInvocationId() {
+    if (!_invocationId) {
+        _invocationId = randomUUID();
+    }
+    return _invocationId;
+}
+// ---------------------------------------------------------------------------
+// Client Request ID — one per outbound request
+// ---------------------------------------------------------------------------
+export function generateClientRequestId() {
+    return randomUUID();
+}
+// ---------------------------------------------------------------------------
+// Correlation headers (added to every AscendKit API call)
+// ---------------------------------------------------------------------------
+export function correlationHeaders() {
+    return {
+        "X-AscendKit-Invocation-Id": getInvocationId(),
+        "X-AscendKit-Client-Request-Id": generateClientRequestId(),
+    };
+}
+// ---------------------------------------------------------------------------
+// Machine ID — persisted in ~/.ascendkit/machine-id
+// ---------------------------------------------------------------------------
+const MACHINE_ID_DIR = join(homedir(), ".ascendkit");
+const MACHINE_ID_PATH = join(MACHINE_ID_DIR, "machine-id");
+let _machineId;
+export function getMachineId() {
+    if (_machineId)
+        return _machineId;
+    try {
+        const stored = readFileSync(MACHINE_ID_PATH, "utf-8").trim();
+        if (stored) {
+            _machineId = stored;
+            return _machineId;
+        }
+    }
+    catch {
+        // File doesn't exist yet — will create below.
+    }
+    _machineId = randomUUID();
+    try {
+        if (!existsSync(MACHINE_ID_DIR)) {
+            mkdirSync(MACHINE_ID_DIR, { recursive: true });
+        }
+        writeFileSync(MACHINE_ID_PATH, _machineId, "utf-8");
+    }
+    catch {
+        // Non-fatal — we still have the in-memory value for this session.
+    }
+    return _machineId;
+}