@zapier/zapier-sdk-cli 0.59.2 → 0.59.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @zapier/zapier-sdk-cli
 
+## 0.59.3
+
+### Patch Changes
+
+- b8ff1dd: Refactor the SDKs onto kitcore's new internal plugin model.
+
+  kitcore (an internal building block) gained a new plugin model, and the SDKs were rebuilt on it behind a compatibility bridge, so existing behavior is unchanged. The only changes to the published packages' surface:
+  - Removed the deprecated `sdk.addPlugin(...)` chain method (and the `WithAddPlugin` type / chain-style no-arg `createSdk()` doorway). Extend a built SDK with the top-level `addPlugin(sdk, plugin)` instead.
+  - `@zapier/zapier-sdk` now re-exports the plugin-authoring helpers (`createSdk`, `defineMethod` / `definePlugin` / `declareMethod` / etc., `selectExports`, `addPlugin`). Note `createSdk` reuses the old doorway's name but now takes a root plugin, so a stale no-arg `createSdk()` call is a compile error rather than silent misbehavior.
+
+- Updated dependencies [b8ff1dd]
+  - @zapier/zapier-sdk@0.78.0
+  - @zapier/zapier-sdk-mcp@0.15.3
+
 ## 0.59.2
 
 ### Patch Changes

package/dist/cli.cjs

@@ -183,18 +183,20 @@ function coerceToSchemaType(value, schema) {
   return value;
 }
 function renderChoiceLabel(choice) {
+  const baseName = choice.label ?? choice.name ?? "";
+  const alreadyNamed = choice.name === baseName;
   let effectiveHint = choice.hint;
   if (effectiveHint === void 0 && (typeof choice.value === "string" || typeof choice.value === "number")) {
     effectiveHint = String(choice.value);
   }
   if (!effectiveHint || Array.isArray(effectiveHint) && effectiveHint.length === 0) {
-    return choice;
+    return alreadyNamed ? choice : { ...choice, name: baseName };
   }
   const hintText = Array.isArray(effectiveHint) ? effectiveHint.join(", ") : effectiveHint;
-  if (hintText === choice.name) {
-    return choice;
+  if (hintText === baseName) {
+    return alreadyNamed ? choice : { ...choice, name: baseName };
   }
-  return { ...choice, name: `${choice.name} ${chalk__default.default.dim(`(${hintText})`)}` };
+  return { ...choice, name: `${baseName} ${chalk__default.default.dim(`(${hintText})`)}` };
 }
 var SchemaParameterResolver = class {
   constructor() {
@@ -792,8 +794,9 @@ var SchemaParameterResolver = class {
           context.resolvedParams
         );
         promptConfig.name = promptName;
+        const renderedChoices = promptConfig.choices ? promptConfig.choices.map(renderChoiceLabel) : [];
         if (promptConfig.choices) {
-          promptConfig.choices = promptConfig.choices.map(renderChoiceLabel);
+          promptConfig.choices = renderedChoices;
         }
         const hasSelectableChoice = promptConfig.choices?.some(
           (c) => !c.disabled
@@ -819,7 +822,7 @@ var SchemaParameterResolver = class {
         }
         let selected;
         if (promptConfig.type === "list") {
-          const dataChoices = promptConfig.choices ?? [];
+          const dataChoices = renderedChoices;
           selected = await search__default.default({
             message: promptConfig.message,
             validate: this.wrapPromptValidate(promptConfig.validate),
@@ -1576,7 +1579,7 @@ var SHARED_COMMAND_CLI_OPTIONS = [
 
 // package.json
 var package_default = {
-  version: "0.59.2"};
+  version: "0.59.3"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {
@@ -1649,19 +1652,11 @@ function formatJsonOutput(data) {
 }
 async function formatItemsFromSchema(_functionInfo, items, startingNumber = 0, options) {
   if (options?.formatter) {
-    let context;
-    if (options.formatter.fetch && options.sdk && options.params) {
-      for (const item of items) {
-        context = await options.formatter.fetch(
-          options.sdk,
-          options.params,
-          item,
-          context
-        );
-      }
-    }
+    const formatter = options.formatter;
+    const input = options.input ?? {};
+    const context = formatter.fetchContext ? await formatter.fetchContext({ items, input }) : void 0;
     items.forEach((item, index) => {
-      const formatted = options.formatter.format(item, context);
+      const formatted = formatter.format({ item, input, context });
       formatSingleItem(formatted, startingNumber + index);
     });
     return;
@@ -1671,13 +1666,19 @@ async function formatItemsFromSchema(_functionInfo, items, startingNumber = 0, o
 function formatSingleItem(formatted, itemNumber) {
   let titleLine = `${chalk__default.default.gray(`${itemNumber + 1}.`)} ${chalk__default.default.cyan(formatted.title)}`;
   const subtitleParts = [];
-  if (formatted.keys) {
-    subtitleParts.push(...formatted.keys);
-  } else if (formatted.key) {
-    subtitleParts.push(formatted.key);
-  }
-  if (formatted.id) {
-    subtitleParts.push(formatted.id);
+  if (formatted.hint !== void 0) {
+    subtitleParts.push(
+      ...Array.isArray(formatted.hint) ? formatted.hint : [formatted.hint]
+    );
+  } else {
+    if (formatted.keys) {
+      subtitleParts.push(...formatted.keys);
+    } else if (formatted.key) {
+      subtitleParts.push(formatted.key);
+    }
+    if (formatted.id) {
+      subtitleParts.push(formatted.id);
+    }
   }
   const uniqueParts = [...new Set(subtitleParts)];
   if (uniqueParts.length > 0) {
@@ -1687,8 +1688,8 @@ function formatSingleItem(formatted, itemNumber) {
   if (formatted.description) {
     console.log(`   ${chalk__default.default.dim(formatted.description)}`);
   }
-  if (formatted.data !== void 0) {
-    formatJsonOutput(formatted.data);
+  if (formatted.raw !== void 0) {
+    formatJsonOutput(formatted.raw);
     console.log();
     return;
   }
@@ -1874,8 +1875,7 @@ function createInteractiveRenderer(context = {}) {
         startingNumber,
         {
           formatter: functionInfo.formatter,
-          sdk: context.sdk,
-          params: context.params
+          input: context.params
         }
       );
     } else {
@@ -2428,7 +2428,6 @@ function createCommandConfig(cliCommandName, functionInfo, sdk) {
     const options = commandObj.opts();
     const interactiveMode = !options.json;
     const renderer = interactiveMode ? createInteractiveRenderer({
-      sdk,
       params: resolvedParams
     }) : createJsonRenderer();
     try {
@@ -7267,7 +7266,7 @@ var watchTriggerInboxCliPlugin = zapierSdk.definePlugin(
 // package.json with { type: 'json' }
 var package_default2 = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.59.2"};
+  version: "0.59.3"};
 
 // src/sdk.ts
 zapierSdk.injectCliLogin(login_exports);
@@ -7276,11 +7275,19 @@ function createZapierCliSdk(options = {}) {
   const extensionsContextPlugin = () => ({
     context: { extensions }
   });
-  const sdk = zapierSdk.createZapierSdkStack({
+  const stack = zapierSdk.createZapierSdkStack({
     ...sdkOptions,
     eventEmission: { ...sdkOptions.eventEmission, callContext: "cli" },
     callerPackage: { name: package_default2.name, version: package_default2.version }
-  }).use(extensionsContextPlugin).use(generateAppTypesPlugin).use(buildManifestPlugin).use(bundleCodePlugin).use(getLoginConfigPathPlugin).use(addAppsPlugin).use(feedbackPlugin).use(curlPlugin).use(initPlugin).use(mcpPlugin).use(loginPlugin).use(signupPlugin).use(logoutPlugin).use(cliOverridesPlugin, { override: true }).toSdk();
+  }).use(extensionsContextPlugin).use(generateAppTypesPlugin).use(buildManifestPlugin).use(bundleCodePlugin).use(getLoginConfigPathPlugin).use(addAppsPlugin).use(feedbackPlugin).use(curlPlugin).use(initPlugin).use(mcpPlugin).use(loginPlugin).use(signupPlugin).use(logoutPlugin).use(cliOverridesPlugin, { override: true });
+  const sdk = zapierSdk.createSdk(
+    zapierSdk.defineLegacyMerge({
+      namespace: "zapier",
+      name: "cli-stack-merge",
+      legacy: stack.toPlugin(),
+      plugin: zapierSdk.zapierSdkPlugin
+    })
+  );
   for (const ext of extensions) {
     try {
       zapierSdk.addPlugin(sdk, ext);
@@ -7301,11 +7308,19 @@ function createZapierCliSdk2(options = {}) {
   const experimentalContextPlugin = () => ({
     context: { experimental: true }
   });
-  const sdk = experimental.createZapierSdkStack({
+  const stack = experimental.createZapierSdkStack({
     ...sdkOptions,
     eventEmission: { ...sdkOptions.eventEmission, callContext: "cli" },
     callerPackage: { name: package_default2.name, version: package_default2.version }
-  }).use(extensionsContextPlugin).use(experimentalContextPlugin).use(generateAppTypesPlugin).use(buildManifestPlugin).use(bundleCodePlugin).use(getLoginConfigPathPlugin).use(addAppsPlugin).use(feedbackPlugin).use(curlPlugin).use(initPlugin).use(drainTriggerInboxCliPlugin, { override: true }).use(watchTriggerInboxCliPlugin, { override: true }).use(mcpPlugin).use(loginPlugin).use(signupPlugin).use(logoutPlugin).use(cliOverridesPlugin, { override: true }).toSdk();
+  }).use(extensionsContextPlugin).use(experimentalContextPlugin).use(generateAppTypesPlugin).use(buildManifestPlugin).use(bundleCodePlugin).use(getLoginConfigPathPlugin).use(addAppsPlugin).use(feedbackPlugin).use(curlPlugin).use(initPlugin).use(drainTriggerInboxCliPlugin, { override: true }).use(watchTriggerInboxCliPlugin, { override: true }).use(mcpPlugin).use(loginPlugin).use(signupPlugin).use(logoutPlugin).use(cliOverridesPlugin, { override: true });
+  const sdk = experimental.createSdk(
+    experimental.defineLegacyMerge({
+      namespace: "zapier",
+      name: "cli-experimental-stack-merge",
+      legacy: stack.toPlugin(),
+      plugin: experimental.zapierSdkPlugin
+    })
+  );
   for (const ext of extensions) {
     try {
       experimental.addPlugin(sdk, ext);

package/dist/cli.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { Command, CommanderError, Option } from 'commander';
 import { z } from 'zod';
-import { definePlugin, createPluginMethod, OutputPropertySchema, ZapierBundleError, DEFAULT_CONFIG_PATH, ZapierValidationError, ZapierUnknownError, ZapierReleaseTriggerMessageSignal, injectCliLogin, BaseSdkOptionsSchema, getOrCreateApiClient, isPermanentHttpError, invalidateCachedToken, batch, toSnakeCase, ZapierAbortDrainSignal, createZapierSdkStack as createZapierSdkStack$1, addPlugin as addPlugin$1, ZapierError, isCredentialsObject, buildApplicationLifecycleEvent, AuthMechanism, ZapierAuthenticationError, runWithCallerContext, isPositional, runWithTelemetryContext, buildCapabilityMessage, formatErrorMessage, getOsInfo, getPlatformVersions, getAgent, getTtyContext, getCiPlatform, isCi, getReleaseId, getCurrentTimestamp, generateEventId, ZapierApprovalError } from '@zapier/zapier-sdk';
+import { definePlugin, createPluginMethod, OutputPropertySchema, ZapierBundleError, DEFAULT_CONFIG_PATH, ZapierValidationError, ZapierUnknownError, ZapierReleaseTriggerMessageSignal, injectCliLogin, BaseSdkOptionsSchema, getOrCreateApiClient, isPermanentHttpError, invalidateCachedToken, batch, toSnakeCase, ZapierAbortDrainSignal, createZapierSdkStack as createZapierSdkStack$1, createSdk as createSdk$1, defineLegacyMerge as defineLegacyMerge$1, zapierSdkPlugin as zapierSdkPlugin$1, addPlugin as addPlugin$1, ZapierError, isCredentialsObject, buildApplicationLifecycleEvent, AuthMechanism, ZapierAuthenticationError, runWithCallerContext, isPositional, runWithTelemetryContext, buildCapabilityMessage, formatErrorMessage, getOsInfo, getPlatformVersions, getAgent, getTtyContext, getCiPlatform, isCi, getReleaseId, getCurrentTimestamp, generateEventId, ZapierApprovalError } from '@zapier/zapier-sdk';
 import inquirer from 'inquirer';
 import search from '@inquirer/search';
 import chalk from 'chalk';
@@ -30,7 +30,7 @@ import isInstalledGlobally from 'is-installed-globally';
 import { execSync, spawn } from 'child_process';
 import Handlebars from 'handlebars';
 import { fileURLToPath } from 'url';
-import { injectCliLogin as injectCliLogin$1, createZapierSdkStack, addPlugin } from '@zapier/zapier-sdk/experimental';
+import { injectCliLogin as injectCliLogin$1, createZapierSdkStack, createSdk, defineLegacyMerge, zapierSdkPlugin, addPlugin } from '@zapier/zapier-sdk/experimental';
 import packageJsonLib, { VersionNotFoundError } from 'package-json';
 import semver from 'semver';
 import React from 'react';
@@ -140,18 +140,20 @@ function coerceToSchemaType(value, schema) {
   return value;
 }
 function renderChoiceLabel(choice) {
+  const baseName = choice.label ?? choice.name ?? "";
+  const alreadyNamed = choice.name === baseName;
   let effectiveHint = choice.hint;
   if (effectiveHint === void 0 && (typeof choice.value === "string" || typeof choice.value === "number")) {
     effectiveHint = String(choice.value);
   }
   if (!effectiveHint || Array.isArray(effectiveHint) && effectiveHint.length === 0) {
-    return choice;
+    return alreadyNamed ? choice : { ...choice, name: baseName };
   }
   const hintText = Array.isArray(effectiveHint) ? effectiveHint.join(", ") : effectiveHint;
-  if (hintText === choice.name) {
-    return choice;
+  if (hintText === baseName) {
+    return alreadyNamed ? choice : { ...choice, name: baseName };
   }
-  return { ...choice, name: `${choice.name} ${chalk.dim(`(${hintText})`)}` };
+  return { ...choice, name: `${baseName} ${chalk.dim(`(${hintText})`)}` };
 }
 var SchemaParameterResolver = class {
   constructor() {
@@ -749,8 +751,9 @@ var SchemaParameterResolver = class {
           context.resolvedParams
         );
         promptConfig.name = promptName;
+        const renderedChoices = promptConfig.choices ? promptConfig.choices.map(renderChoiceLabel) : [];
         if (promptConfig.choices) {
-          promptConfig.choices = promptConfig.choices.map(renderChoiceLabel);
+          promptConfig.choices = renderedChoices;
         }
         const hasSelectableChoice = promptConfig.choices?.some(
           (c) => !c.disabled
@@ -776,7 +779,7 @@ var SchemaParameterResolver = class {
         }
         let selected;
         if (promptConfig.type === "list") {
-          const dataChoices = promptConfig.choices ?? [];
+          const dataChoices = renderedChoices;
           selected = await search({
             message: promptConfig.message,
             validate: this.wrapPromptValidate(promptConfig.validate),
@@ -1533,7 +1536,7 @@ var SHARED_COMMAND_CLI_OPTIONS = [
 
 // package.json
 var package_default = {
-  version: "0.59.2"};
+  version: "0.59.3"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {
@@ -1606,19 +1609,11 @@ function formatJsonOutput(data) {
 }
 async function formatItemsFromSchema(_functionInfo, items, startingNumber = 0, options) {
   if (options?.formatter) {
-    let context;
-    if (options.formatter.fetch && options.sdk && options.params) {
-      for (const item of items) {
-        context = await options.formatter.fetch(
-          options.sdk,
-          options.params,
-          item,
-          context
-        );
-      }
-    }
+    const formatter = options.formatter;
+    const input = options.input ?? {};
+    const context = formatter.fetchContext ? await formatter.fetchContext({ items, input }) : void 0;
     items.forEach((item, index) => {
-      const formatted = options.formatter.format(item, context);
+      const formatted = formatter.format({ item, input, context });
       formatSingleItem(formatted, startingNumber + index);
     });
     return;
@@ -1628,13 +1623,19 @@ async function formatItemsFromSchema(_functionInfo, items, startingNumber = 0, o
 function formatSingleItem(formatted, itemNumber) {
   let titleLine = `${chalk.gray(`${itemNumber + 1}.`)} ${chalk.cyan(formatted.title)}`;
   const subtitleParts = [];
-  if (formatted.keys) {
-    subtitleParts.push(...formatted.keys);
-  } else if (formatted.key) {
-    subtitleParts.push(formatted.key);
-  }
-  if (formatted.id) {
-    subtitleParts.push(formatted.id);
+  if (formatted.hint !== void 0) {
+    subtitleParts.push(
+      ...Array.isArray(formatted.hint) ? formatted.hint : [formatted.hint]
+    );
+  } else {
+    if (formatted.keys) {
+      subtitleParts.push(...formatted.keys);
+    } else if (formatted.key) {
+      subtitleParts.push(formatted.key);
+    }
+    if (formatted.id) {
+      subtitleParts.push(formatted.id);
+    }
   }
   const uniqueParts = [...new Set(subtitleParts)];
   if (uniqueParts.length > 0) {
@@ -1644,8 +1645,8 @@ function formatSingleItem(formatted, itemNumber) {
   if (formatted.description) {
     console.log(`   ${chalk.dim(formatted.description)}`);
   }
-  if (formatted.data !== void 0) {
-    formatJsonOutput(formatted.data);
+  if (formatted.raw !== void 0) {
+    formatJsonOutput(formatted.raw);
     console.log();
     return;
   }
@@ -1831,8 +1832,7 @@ function createInteractiveRenderer(context = {}) {
         startingNumber,
         {
           formatter: functionInfo.formatter,
-          sdk: context.sdk,
-          params: context.params
+          input: context.params
         }
       );
     } else {
@@ -2385,7 +2385,6 @@ function createCommandConfig(cliCommandName, functionInfo, sdk) {
     const options = commandObj.opts();
     const interactiveMode = !options.json;
     const renderer = interactiveMode ? createInteractiveRenderer({
-      sdk,
       params: resolvedParams
     }) : createJsonRenderer();
     try {
@@ -7224,7 +7223,7 @@ var watchTriggerInboxCliPlugin = definePlugin(
 // package.json with { type: 'json' }
 var package_default2 = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.59.2"};
+  version: "0.59.3"};
 
 // src/sdk.ts
 injectCliLogin(login_exports);
@@ -7233,11 +7232,19 @@ function createZapierCliSdk(options = {}) {
   const extensionsContextPlugin = () => ({
     context: { extensions }
   });
-  const sdk = createZapierSdkStack$1({
+  const stack = createZapierSdkStack$1({
     ...sdkOptions,
     eventEmission: { ...sdkOptions.eventEmission, callContext: "cli" },
     callerPackage: { name: package_default2.name, version: package_default2.version }
-  }).use(extensionsContextPlugin).use(generateAppTypesPlugin).use(buildManifestPlugin).use(bundleCodePlugin).use(getLoginConfigPathPlugin).use(addAppsPlugin).use(feedbackPlugin).use(curlPlugin).use(initPlugin).use(mcpPlugin).use(loginPlugin).use(signupPlugin).use(logoutPlugin).use(cliOverridesPlugin, { override: true }).toSdk();
+  }).use(extensionsContextPlugin).use(generateAppTypesPlugin).use(buildManifestPlugin).use(bundleCodePlugin).use(getLoginConfigPathPlugin).use(addAppsPlugin).use(feedbackPlugin).use(curlPlugin).use(initPlugin).use(mcpPlugin).use(loginPlugin).use(signupPlugin).use(logoutPlugin).use(cliOverridesPlugin, { override: true });
+  const sdk = createSdk$1(
+    defineLegacyMerge$1({
+      namespace: "zapier",
+      name: "cli-stack-merge",
+      legacy: stack.toPlugin(),
+      plugin: zapierSdkPlugin$1
+    })
+  );
   for (const ext of extensions) {
     try {
       addPlugin$1(sdk, ext);
@@ -7258,11 +7265,19 @@ function createZapierCliSdk2(options = {}) {
   const experimentalContextPlugin = () => ({
     context: { experimental: true }
   });
-  const sdk = createZapierSdkStack({
+  const stack = createZapierSdkStack({
     ...sdkOptions,
     eventEmission: { ...sdkOptions.eventEmission, callContext: "cli" },
     callerPackage: { name: package_default2.name, version: package_default2.version }
-  }).use(extensionsContextPlugin).use(experimentalContextPlugin).use(generateAppTypesPlugin).use(buildManifestPlugin).use(bundleCodePlugin).use(getLoginConfigPathPlugin).use(addAppsPlugin).use(feedbackPlugin).use(curlPlugin).use(initPlugin).use(drainTriggerInboxCliPlugin, { override: true }).use(watchTriggerInboxCliPlugin, { override: true }).use(mcpPlugin).use(loginPlugin).use(signupPlugin).use(logoutPlugin).use(cliOverridesPlugin, { override: true }).toSdk();
+  }).use(extensionsContextPlugin).use(experimentalContextPlugin).use(generateAppTypesPlugin).use(buildManifestPlugin).use(bundleCodePlugin).use(getLoginConfigPathPlugin).use(addAppsPlugin).use(feedbackPlugin).use(curlPlugin).use(initPlugin).use(drainTriggerInboxCliPlugin, { override: true }).use(watchTriggerInboxCliPlugin, { override: true }).use(mcpPlugin).use(loginPlugin).use(signupPlugin).use(logoutPlugin).use(cliOverridesPlugin, { override: true });
+  const sdk = createSdk(
+    defineLegacyMerge({
+      namespace: "zapier",
+      name: "cli-experimental-stack-merge",
+      legacy: stack.toPlugin(),
+      plugin: zapierSdkPlugin
+    })
+  );
   for (const ext of extensions) {
     try {
       addPlugin(sdk, ext);

package/dist/experimental.cjs

@@ -4594,7 +4594,7 @@ var watchTriggerInboxCliPlugin = zapierSdk.definePlugin(
 // package.json with { type: 'json' }
 var package_default = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.59.2"};
+  version: "0.59.3"};
 
 // src/experimental.ts
 experimental.injectCliLogin(login_exports);
@@ -4606,11 +4606,19 @@ function createZapierCliSdk(options = {}) {
   const experimentalContextPlugin = () => ({
     context: { experimental: true }
   });
-  const sdk = experimental.createZapierSdkStack({
+  const stack = experimental.createZapierSdkStack({
     ...sdkOptions,
     eventEmission: { ...sdkOptions.eventEmission, callContext: "cli" },
     callerPackage: { name: package_default.name, version: package_default.version }
-  }).use(extensionsContextPlugin).use(experimentalContextPlugin).use(generateAppTypesPlugin).use(buildManifestPlugin).use(bundleCodePlugin).use(getLoginConfigPathPlugin).use(addAppsPlugin).use(feedbackPlugin).use(curlPlugin).use(initPlugin).use(drainTriggerInboxCliPlugin, { override: true }).use(watchTriggerInboxCliPlugin, { override: true }).use(mcpPlugin).use(loginPlugin).use(signupPlugin).use(logoutPlugin).use(cliOverridesPlugin, { override: true }).toSdk();
+  }).use(extensionsContextPlugin).use(experimentalContextPlugin).use(generateAppTypesPlugin).use(buildManifestPlugin).use(bundleCodePlugin).use(getLoginConfigPathPlugin).use(addAppsPlugin).use(feedbackPlugin).use(curlPlugin).use(initPlugin).use(drainTriggerInboxCliPlugin, { override: true }).use(watchTriggerInboxCliPlugin, { override: true }).use(mcpPlugin).use(loginPlugin).use(signupPlugin).use(logoutPlugin).use(cliOverridesPlugin, { override: true });
+  const sdk = experimental.createSdk(
+    experimental.defineLegacyMerge({
+      namespace: "zapier",
+      name: "cli-experimental-stack-merge",
+      legacy: stack.toPlugin(),
+      plugin: experimental.zapierSdkPlugin
+    })
+  );
   for (const ext of extensions) {
     try {
       experimental.addPlugin(sdk, ext);

package/dist/experimental.mjs

@@ -9,7 +9,7 @@ import { resolve, join, dirname, basename, relative, extname } from 'path';
 import * as lockfile from 'proper-lockfile';
 import { definePlugin, createPluginMethod, OutputPropertySchema, ZapierBundleError, DEFAULT_CONFIG_PATH, ZapierValidationError, ZapierUnknownError, ZapierReleaseTriggerMessageSignal, getOrCreateApiClient, isPermanentHttpError, invalidateCachedToken, batch, toSnakeCase, ZapierAbortDrainSignal, isCredentialsObject, buildApplicationLifecycleEvent, AuthMechanism, ZapierAuthenticationError, ZapierError } from '@zapier/zapier-sdk';
 import { z } from 'zod';
-import { injectCliLogin, createZapierSdkStack, addPlugin } from '@zapier/zapier-sdk/experimental';
+import { injectCliLogin, createZapierSdkStack, createSdk, defineLegacyMerge, zapierSdkPlugin, addPlugin } from '@zapier/zapier-sdk/experimental';
 import { hostname } from 'os';
 import inquirer from 'inquirer';
 import express from 'express';
@@ -4558,7 +4558,7 @@ var watchTriggerInboxCliPlugin = definePlugin(
 // package.json with { type: 'json' }
 var package_default = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.59.2"};
+  version: "0.59.3"};
 
 // src/experimental.ts
 injectCliLogin(login_exports);
@@ -4570,11 +4570,19 @@ function createZapierCliSdk(options = {}) {
   const experimentalContextPlugin = () => ({
     context: { experimental: true }
   });
-  const sdk = createZapierSdkStack({
+  const stack = createZapierSdkStack({
     ...sdkOptions,
     eventEmission: { ...sdkOptions.eventEmission, callContext: "cli" },
     callerPackage: { name: package_default.name, version: package_default.version }
-  }).use(extensionsContextPlugin).use(experimentalContextPlugin).use(generateAppTypesPlugin).use(buildManifestPlugin).use(bundleCodePlugin).use(getLoginConfigPathPlugin).use(addAppsPlugin).use(feedbackPlugin).use(curlPlugin).use(initPlugin).use(drainTriggerInboxCliPlugin, { override: true }).use(watchTriggerInboxCliPlugin, { override: true }).use(mcpPlugin).use(loginPlugin).use(signupPlugin).use(logoutPlugin).use(cliOverridesPlugin, { override: true }).toSdk();
+  }).use(extensionsContextPlugin).use(experimentalContextPlugin).use(generateAppTypesPlugin).use(buildManifestPlugin).use(bundleCodePlugin).use(getLoginConfigPathPlugin).use(addAppsPlugin).use(feedbackPlugin).use(curlPlugin).use(initPlugin).use(drainTriggerInboxCliPlugin, { override: true }).use(watchTriggerInboxCliPlugin, { override: true }).use(mcpPlugin).use(loginPlugin).use(signupPlugin).use(logoutPlugin).use(cliOverridesPlugin, { override: true });
+  const sdk = createSdk(
+    defineLegacyMerge({
+      namespace: "zapier",
+      name: "cli-experimental-stack-merge",
+      legacy: stack.toPlugin(),
+      plugin: zapierSdkPlugin
+    })
+  );
   for (const ext of extensions) {
     try {
       addPlugin(sdk, ext);

package/dist/index.cjs

@@ -4593,7 +4593,7 @@ zapierSdk.definePlugin(
 // package.json with { type: 'json' }
 var package_default = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.59.2"};
+  version: "0.59.3"};
 
 // src/sdk.ts
 zapierSdk.injectCliLogin(login_exports);
@@ -4602,11 +4602,19 @@ function createZapierCliSdk(options = {}) {
   const extensionsContextPlugin = () => ({
     context: { extensions }
   });
-  const sdk = zapierSdk.createZapierSdkStack({
+  const stack = zapierSdk.createZapierSdkStack({
     ...sdkOptions,
     eventEmission: { ...sdkOptions.eventEmission, callContext: "cli" },
     callerPackage: { name: package_default.name, version: package_default.version }
-  }).use(extensionsContextPlugin).use(generateAppTypesPlugin).use(buildManifestPlugin).use(bundleCodePlugin).use(getLoginConfigPathPlugin).use(addAppsPlugin).use(feedbackPlugin).use(curlPlugin).use(initPlugin).use(mcpPlugin).use(loginPlugin).use(signupPlugin).use(logoutPlugin).use(cliOverridesPlugin, { override: true }).toSdk();
+  }).use(extensionsContextPlugin).use(generateAppTypesPlugin).use(buildManifestPlugin).use(bundleCodePlugin).use(getLoginConfigPathPlugin).use(addAppsPlugin).use(feedbackPlugin).use(curlPlugin).use(initPlugin).use(mcpPlugin).use(loginPlugin).use(signupPlugin).use(logoutPlugin).use(cliOverridesPlugin, { override: true });
+  const sdk = zapierSdk.createSdk(
+    zapierSdk.defineLegacyMerge({
+      namespace: "zapier",
+      name: "cli-stack-merge",
+      legacy: stack.toPlugin(),
+      plugin: zapierSdk.zapierSdkPlugin
+    })
+  );
   for (const ext of extensions) {
     try {
       zapierSdk.addPlugin(sdk, ext);
@@ -4621,7 +4629,7 @@ function createZapierCliSdk(options = {}) {
 
 // package.json
 var package_default2 = {
-  version: "0.59.2"};
+  version: "0.59.3"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {

package/dist/index.mjs

@@ -7,7 +7,7 @@ import crypto, { createHash } from 'crypto';
 import * as path from 'path';
 import { resolve, join, dirname, basename, relative, extname } from 'path';
 import * as lockfile from 'proper-lockfile';
-import { definePlugin, createPluginMethod, OutputPropertySchema, ZapierBundleError, DEFAULT_CONFIG_PATH, ZapierValidationError, ZapierUnknownError, ZapierReleaseTriggerMessageSignal, injectCliLogin, getOrCreateApiClient, isPermanentHttpError, invalidateCachedToken, batch, toSnakeCase, ZapierAbortDrainSignal, isCredentialsObject, buildApplicationLifecycleEvent, AuthMechanism, ZapierAuthenticationError, ZapierError, createZapierSdkStack, addPlugin, getOsInfo, getPlatformVersions, getAgent, getTtyContext, getCiPlatform, isCi, getReleaseId, getCurrentTimestamp, generateEventId } from '@zapier/zapier-sdk';
+import { definePlugin, createPluginMethod, OutputPropertySchema, ZapierBundleError, DEFAULT_CONFIG_PATH, ZapierValidationError, ZapierUnknownError, ZapierReleaseTriggerMessageSignal, injectCliLogin, getOrCreateApiClient, isPermanentHttpError, invalidateCachedToken, batch, toSnakeCase, ZapierAbortDrainSignal, isCredentialsObject, buildApplicationLifecycleEvent, AuthMechanism, ZapierAuthenticationError, ZapierError, createZapierSdkStack, createSdk, defineLegacyMerge, zapierSdkPlugin, addPlugin, getOsInfo, getPlatformVersions, getAgent, getTtyContext, getCiPlatform, isCi, getReleaseId, getCurrentTimestamp, generateEventId } from '@zapier/zapier-sdk';
 import { z } from 'zod';
 import { hostname } from 'os';
 import inquirer from 'inquirer';
@@ -4557,7 +4557,7 @@ definePlugin(
 // package.json with { type: 'json' }
 var package_default = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.59.2"};
+  version: "0.59.3"};
 
 // src/sdk.ts
 injectCliLogin(login_exports);
@@ -4566,11 +4566,19 @@ function createZapierCliSdk(options = {}) {
   const extensionsContextPlugin = () => ({
     context: { extensions }
   });
-  const sdk = createZapierSdkStack({
+  const stack = createZapierSdkStack({
     ...sdkOptions,
     eventEmission: { ...sdkOptions.eventEmission, callContext: "cli" },
     callerPackage: { name: package_default.name, version: package_default.version }
-  }).use(extensionsContextPlugin).use(generateAppTypesPlugin).use(buildManifestPlugin).use(bundleCodePlugin).use(getLoginConfigPathPlugin).use(addAppsPlugin).use(feedbackPlugin).use(curlPlugin).use(initPlugin).use(mcpPlugin).use(loginPlugin).use(signupPlugin).use(logoutPlugin).use(cliOverridesPlugin, { override: true }).toSdk();
+  }).use(extensionsContextPlugin).use(generateAppTypesPlugin).use(buildManifestPlugin).use(bundleCodePlugin).use(getLoginConfigPathPlugin).use(addAppsPlugin).use(feedbackPlugin).use(curlPlugin).use(initPlugin).use(mcpPlugin).use(loginPlugin).use(signupPlugin).use(logoutPlugin).use(cliOverridesPlugin, { override: true });
+  const sdk = createSdk(
+    defineLegacyMerge({
+      namespace: "zapier",
+      name: "cli-stack-merge",
+      legacy: stack.toPlugin(),
+      plugin: zapierSdkPlugin
+    })
+  );
   for (const ext of extensions) {
     try {
       addPlugin(sdk, ext);
@@ -4585,7 +4593,7 @@ function createZapierCliSdk(options = {}) {
 
 // package.json
 var package_default2 = {
-  version: "0.59.2"};
+  version: "0.59.3"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zapier/zapier-sdk-cli",
-  "version": "0.59.2",
+  "version": "0.59.3",
   "description": "Command line interface for Zapier SDK",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -95,8 +95,8 @@
     "typescript": "^5.8.3",
     "wrap-ansi": "^10.0.0",
     "zod": "4.3.6",
-    "@zapier/zapier-sdk": "0.77.2",
-    "@zapier/zapier-sdk-mcp": "0.15.2"
+    "@zapier/zapier-sdk": "0.78.0",
+    "@zapier/zapier-sdk-mcp": "0.15.3"
   },
   "devDependencies": {
     "@types/express": "^5.0.3",