@zapier/zapier-sdk-cli 0.61.0 → 0.61.2

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @zapier/zapier-sdk-cli
 
+## 0.61.2
+
+### Patch Changes
+
+- 4fd8dce: _This release contains no user-facing changes._
+- Updated dependencies [4fd8dce]
+  - @zapier/zapier-sdk@0.80.1
+  - @zapier/zapier-sdk-mcp@0.16.2
+
+## 0.61.1
+
+### Patch Changes
+
+- 5e2cf0d: Internal refactoring of interactive parameter resolution. No change to existing commands.
+- Updated dependencies [5e2cf0d]
+- Updated dependencies [5e2cf0d]
+  - @zapier/zapier-sdk-mcp@0.16.1
+  - @zapier/zapier-sdk@0.80.0
+
 ## 0.61.0
 
 ### Minor Changes

package/dist/cli.cjs

@@ -1554,6 +1554,148 @@ Optional fields${pathContext}:`));
     return constants;
   }
 };
+function offers(question, action) {
+  return question.actions.some((a) => a.action === action);
+}
+function isActionRow(value) {
+  return typeof value === "object" && value !== null && "action" in value;
+}
+async function promptText({
+  message,
+  password
+}) {
+  const { value } = await inquirer__default.default.prompt([
+    { type: password ? "password" : "input", name: "value", message }
+  ]);
+  return value;
+}
+async function answerSelect(question, field) {
+  const display = (c) => c.hint ? `${c.label} ${chalk__default.default.dim(`(${c.hint})`)}` : c.label;
+  if (question.multiple) {
+    const choices = [
+      ...question.choices.map((c) => ({ name: display(c), value: c.value })),
+      ...offers(question, "more") ? [
+        {
+          name: chalk__default.default.dim("Load more\u2026"),
+          value: { action: "more" }
+        }
+      ] : [],
+      ...(question.notes ?? []).map((note) => ({
+        name: chalk__default.default.dim(note),
+        value: note,
+        disabled: true
+      }))
+    ];
+    const { values } = await inquirer__default.default.prompt([
+      { type: "checkbox", name: "values", message: question.message, choices }
+    ]);
+    const selected = values;
+    if (selected.some(isActionRow)) return { type: "more" };
+    if (selected.length === 0 && offers(question, "skip")) {
+      return { type: "skip" };
+    }
+    return { type: "choose", value: selected };
+  }
+  const row = (name, action) => ({
+    name,
+    value: { action }
+  });
+  const value = await search__default.default({
+    message: question.message,
+    source: (term) => {
+      const t = (term ?? "").trim().toLowerCase();
+      const matched = t ? question.choices.filter(
+        (c) => `${c.label} ${c.hint ?? ""}`.toLowerCase().includes(t)
+      ) : question.choices;
+      const rows = matched.map((c) => ({
+        name: display(c),
+        value: c.value
+      }));
+      if (offers(question, "search"))
+        rows.push(row(chalk__default.default.cyan("Search\u2026"), "search"));
+      if (offers(question, "more"))
+        rows.push(row(chalk__default.default.dim("Load more\u2026"), "more"));
+      if (offers(question, "custom"))
+        rows.push(row(chalk__default.default.dim("Enter a value manually\u2026"), "custom"));
+      if (offers(question, "retry"))
+        rows.push(row(chalk__default.default.yellow("Retry"), "retry"));
+      if (offers(question, "skip"))
+        rows.push(row(chalk__default.default.dim("Skip (optional)"), "skip"));
+      if (offers(question, "cancel"))
+        rows.push(row(chalk__default.default.dim("Cancel"), "cancel"));
+      for (const note of question.notes ?? [])
+        rows.push({ name: chalk__default.default.dim(note), value: note, disabled: true });
+      return rows;
+    }
+  });
+  if (!isActionRow(value)) {
+    return { type: "choose", value };
+  }
+  switch (value.action) {
+    case "search": {
+      const term = await promptText({
+        message: `Search ${field}:`,
+        password: false
+      });
+      return { type: "search", term };
+    }
+    case "custom": {
+      const custom = await promptText({
+        message: `Enter ${field}:`,
+        password: false
+      });
+      return { type: "custom", value: custom };
+    }
+    case "more":
+      return { type: "more" };
+    case "retry":
+      return { type: "retry" };
+    case "skip":
+      return { type: "skip" };
+    case "cancel":
+      return { type: "cancel" };
+  }
+}
+async function answerInput(question) {
+  const value = await promptText({
+    message: question.message,
+    password: question.inputType === "password"
+  });
+  if (value === "" && offers(question, "skip")) {
+    return { type: "skip" };
+  }
+  return { type: "custom", value };
+}
+async function answerCollection(question) {
+  if (!offers(question, "done")) {
+    return { type: "add" };
+  }
+  const { again } = await inquirer__default.default.prompt([
+    {
+      type: "confirm",
+      name: "again",
+      message: question.message,
+      default: false
+    }
+  ]);
+  return again ? { type: "add" } : { type: "done" };
+}
+var answerViaCli = ({ state, result }) => {
+  if (result.error !== void 0) {
+    const message = typeof result.error === "string" ? result.error : result.error.message;
+    console.log(chalk__default.default.yellow(`! ${message}`));
+  }
+  const field = state.current?.join(".") ?? "value";
+  const question = result.question;
+  switch (question.type) {
+    case "select":
+      return answerSelect(question, field);
+    case "input":
+      return answerInput(question);
+    case "collection":
+      return answerCollection(question);
+  }
+};
 
 // src/utils/cli-options.ts
 var RESERVED_CLI_OPTIONS = [
@@ -1585,7 +1727,7 @@ var SHARED_COMMAND_CLI_OPTIONS = [
 
 // package.json
 var package_default = {
-  version: "0.61.0"};
+  version: "0.61.2"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {
@@ -1660,7 +1802,7 @@ async function formatItemsFromSchema(_functionInfo, items, startingNumber = 0, o
   if (options?.formatter) {
     const formatter = options.formatter;
     const input = options.input ?? {};
-    const context = formatter.fetchContext ? await formatter.fetchContext({ items, input }) : void 0;
+    const context = formatter.getContext ? await formatter.getContext({ items, input }) : void 0;
     items.forEach((item, index) => {
       const formatted = formatter.format({ item, input, context });
       formatSingleItem(formatted, startingNumber + index);
@@ -2255,7 +2397,7 @@ function analyzeZodField(name, schema, functionInfo) {
     paramType = "object";
   }
   let paramHasResolver = false;
-  if (functionInfo?.resolvers?.[name]) {
+  if (functionInfo?.resolvers?.[name] || functionInfo?.boundResolvers?.[name]) {
     paramHasResolver = true;
   }
   return {
@@ -2414,6 +2556,9 @@ function createCommandConfig(cliCommandName, functionInfo, sdk) {
   const usesInputParameters = !functionInfo.inputSchema && !!functionInfo.inputParameters;
   const schema = functionInfo.inputSchema;
   const parameters = usesInputParameters ? analyzeInputParameters(functionInfo.inputParameters, functionInfo) : analyzeZodSchema(schema, functionInfo);
+  if (functionInfo.boundResolvers && Object.keys(functionInfo.boundResolvers).length > 0) {
+    for (const param of parameters) param.hasResolver = true;
+  }
   const schemaAliases = getSchemaAliases(schema);
   if (schemaAliases) {
     const aliasedNames = new Set(Object.keys(schemaAliases));
@@ -2466,7 +2611,35 @@ function createCommandConfig(cliCommandName, functionInfo, sdk) {
           }
         }
       }
-      if (schema && !usesInputParameters) {
+      const boundResolvers = functionInfo.boundResolvers;
+      if (boundResolvers && Object.keys(boundResolvers).length > 0) {
+        const seedInput = Object.fromEntries(
+          Object.entries(rawParams).filter(([, v]) => v !== void 0)
+        );
+        const controller = zapierSdk.createController(sdk);
+        let resolved;
+        try {
+          resolved = await controller.resolve({
+            method: functionInfo.name,
+            input: seedInput,
+            answer: interactiveMode ? answerViaCli : ({ state }) => {
+              throw new ZapierCliMissingParametersError([
+                {
+                  name: state.current?.join(".") ?? "value",
+                  isPositional: false
+                }
+              ]);
+            },
+            interactive: interactiveMode
+          });
+        } catch (err) {
+          if (err instanceof zapierSdk.CoreCancelledSignal) {
+            throw new ZapierCliUserCancellationError();
+          }
+          throw err;
+        }
+        Object.assign(resolvedParams, resolved);
+      } else if (schema && !usesInputParameters) {
         const resolver = new SchemaParameterResolver();
         const resolved = await resolver.resolveParameters(
           schema,
@@ -2559,7 +2732,7 @@ ${confirmMessageAfter}`));
         }
       }
     } catch (error) {
-      success = false;
+      success = error instanceof ZapierCliError ? error.exitCode === 0 : false;
       errorMessage = error instanceof Error ? error.message : String(error);
       if (error instanceof ZapierCliMissingParametersError) {
         renderer.renderError(error);
@@ -4757,7 +4930,8 @@ async function runAccountAuth({
   });
   const scopedApi = zapierSdk.getOrCreateApiClient({
     credentials: accessToken,
-    baseUrl: credentialsBaseUrl2
+    baseUrl: credentialsBaseUrl2,
+    callerPackage: sdk.context.options?.callerPackage
   });
   const profile = await getProfile(scopedApi);
   process.stderr.write(`${getProfileMessage(entryPoint, profile.email)}
@@ -7438,7 +7612,7 @@ function buildBoxLines(message) {
 // package.json with { type: 'json' }
 var package_default2 = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.61.0"};
+  version: "0.61.2"};
 
 // src/sdk.ts
 zapierSdk.injectCliLogin(login_exports);
@@ -7515,6 +7689,9 @@ function createZapierCliSdk2(options = {}) {
 
 // src/utils/extensions.ts
 var ENV_VAR = "ZAPIER_SDK_EXTENSIONS";
+function isModelPlugin(value) {
+  return typeof value === "object" && value !== null && "pluginType" in value && typeof value.pluginType === "string";
+}
 async function resolveExtensions() {
   const seen = /* @__PURE__ */ new Set();
   const specs = readEnvSpecs().filter((spec) => {
@@ -7547,8 +7724,11 @@ function normalizeExtension(exported) {
   if (typeof exported === "function") {
     return [exported];
   }
+  if (isModelPlugin(exported)) {
+    return [exported];
+  }
   if (Array.isArray(exported)) {
-    if (exported.every((e) => typeof e === "function")) {
+    if (exported.every((e) => typeof e === "function" || isModelPlugin(e))) {
       return exported;
     }
     return null;

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, createSdk as createSdk$1, defineLegacyMerge as defineLegacyMerge$1, zapierSdkPlugin as zapierSdkPlugin$1, addPlugin as addPlugin$1, ZapierError, isCredentialsObject, buildApplicationLifecycleEvent, AuthMechanism, ZapierAuthenticationError, DEPRECATION_NOTICE_EVENT, 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, DEPRECATION_NOTICE_EVENT, runWithCallerContext, isPositional, createController, CoreCancelledSignal, 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';
@@ -1511,6 +1511,148 @@ Optional fields${pathContext}:`));
     return constants;
   }
 };
+function offers(question, action) {
+  return question.actions.some((a) => a.action === action);
+}
+function isActionRow(value) {
+  return typeof value === "object" && value !== null && "action" in value;
+}
+async function promptText({
+  message,
+  password
+}) {
+  const { value } = await inquirer.prompt([
+    { type: password ? "password" : "input", name: "value", message }
+  ]);
+  return value;
+}
+async function answerSelect(question, field) {
+  const display = (c) => c.hint ? `${c.label} ${chalk.dim(`(${c.hint})`)}` : c.label;
+  if (question.multiple) {
+    const choices = [
+      ...question.choices.map((c) => ({ name: display(c), value: c.value })),
+      ...offers(question, "more") ? [
+        {
+          name: chalk.dim("Load more\u2026"),
+          value: { action: "more" }
+        }
+      ] : [],
+      ...(question.notes ?? []).map((note) => ({
+        name: chalk.dim(note),
+        value: note,
+        disabled: true
+      }))
+    ];
+    const { values } = await inquirer.prompt([
+      { type: "checkbox", name: "values", message: question.message, choices }
+    ]);
+    const selected = values;
+    if (selected.some(isActionRow)) return { type: "more" };
+    if (selected.length === 0 && offers(question, "skip")) {
+      return { type: "skip" };
+    }
+    return { type: "choose", value: selected };
+  }
+  const row = (name, action) => ({
+    name,
+    value: { action }
+  });
+  const value = await search({
+    message: question.message,
+    source: (term) => {
+      const t = (term ?? "").trim().toLowerCase();
+      const matched = t ? question.choices.filter(
+        (c) => `${c.label} ${c.hint ?? ""}`.toLowerCase().includes(t)
+      ) : question.choices;
+      const rows = matched.map((c) => ({
+        name: display(c),
+        value: c.value
+      }));
+      if (offers(question, "search"))
+        rows.push(row(chalk.cyan("Search\u2026"), "search"));
+      if (offers(question, "more"))
+        rows.push(row(chalk.dim("Load more\u2026"), "more"));
+      if (offers(question, "custom"))
+        rows.push(row(chalk.dim("Enter a value manually\u2026"), "custom"));
+      if (offers(question, "retry"))
+        rows.push(row(chalk.yellow("Retry"), "retry"));
+      if (offers(question, "skip"))
+        rows.push(row(chalk.dim("Skip (optional)"), "skip"));
+      if (offers(question, "cancel"))
+        rows.push(row(chalk.dim("Cancel"), "cancel"));
+      for (const note of question.notes ?? [])
+        rows.push({ name: chalk.dim(note), value: note, disabled: true });
+      return rows;
+    }
+  });
+  if (!isActionRow(value)) {
+    return { type: "choose", value };
+  }
+  switch (value.action) {
+    case "search": {
+      const term = await promptText({
+        message: `Search ${field}:`,
+        password: false
+      });
+      return { type: "search", term };
+    }
+    case "custom": {
+      const custom = await promptText({
+        message: `Enter ${field}:`,
+        password: false
+      });
+      return { type: "custom", value: custom };
+    }
+    case "more":
+      return { type: "more" };
+    case "retry":
+      return { type: "retry" };
+    case "skip":
+      return { type: "skip" };
+    case "cancel":
+      return { type: "cancel" };
+  }
+}
+async function answerInput(question) {
+  const value = await promptText({
+    message: question.message,
+    password: question.inputType === "password"
+  });
+  if (value === "" && offers(question, "skip")) {
+    return { type: "skip" };
+  }
+  return { type: "custom", value };
+}
+async function answerCollection(question) {
+  if (!offers(question, "done")) {
+    return { type: "add" };
+  }
+  const { again } = await inquirer.prompt([
+    {
+      type: "confirm",
+      name: "again",
+      message: question.message,
+      default: false
+    }
+  ]);
+  return again ? { type: "add" } : { type: "done" };
+}
+var answerViaCli = ({ state, result }) => {
+  if (result.error !== void 0) {
+    const message = typeof result.error === "string" ? result.error : result.error.message;
+    console.log(chalk.yellow(`! ${message}`));
+  }
+  const field = state.current?.join(".") ?? "value";
+  const question = result.question;
+  switch (question.type) {
+    case "select":
+      return answerSelect(question, field);
+    case "input":
+      return answerInput(question);
+    case "collection":
+      return answerCollection(question);
+  }
+};
 
 // src/utils/cli-options.ts
 var RESERVED_CLI_OPTIONS = [
@@ -1542,7 +1684,7 @@ var SHARED_COMMAND_CLI_OPTIONS = [
 
 // package.json
 var package_default = {
-  version: "0.61.0"};
+  version: "0.61.2"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {
@@ -1617,7 +1759,7 @@ async function formatItemsFromSchema(_functionInfo, items, startingNumber = 0, o
   if (options?.formatter) {
     const formatter = options.formatter;
     const input = options.input ?? {};
-    const context = formatter.fetchContext ? await formatter.fetchContext({ items, input }) : void 0;
+    const context = formatter.getContext ? await formatter.getContext({ items, input }) : void 0;
     items.forEach((item, index) => {
       const formatted = formatter.format({ item, input, context });
       formatSingleItem(formatted, startingNumber + index);
@@ -2212,7 +2354,7 @@ function analyzeZodField(name, schema, functionInfo) {
     paramType = "object";
   }
   let paramHasResolver = false;
-  if (functionInfo?.resolvers?.[name]) {
+  if (functionInfo?.resolvers?.[name] || functionInfo?.boundResolvers?.[name]) {
     paramHasResolver = true;
   }
   return {
@@ -2371,6 +2513,9 @@ function createCommandConfig(cliCommandName, functionInfo, sdk) {
   const usesInputParameters = !functionInfo.inputSchema && !!functionInfo.inputParameters;
   const schema = functionInfo.inputSchema;
   const parameters = usesInputParameters ? analyzeInputParameters(functionInfo.inputParameters, functionInfo) : analyzeZodSchema(schema, functionInfo);
+  if (functionInfo.boundResolvers && Object.keys(functionInfo.boundResolvers).length > 0) {
+    for (const param of parameters) param.hasResolver = true;
+  }
   const schemaAliases = getSchemaAliases(schema);
   if (schemaAliases) {
     const aliasedNames = new Set(Object.keys(schemaAliases));
@@ -2423,7 +2568,35 @@ function createCommandConfig(cliCommandName, functionInfo, sdk) {
           }
         }
       }
-      if (schema && !usesInputParameters) {
+      const boundResolvers = functionInfo.boundResolvers;
+      if (boundResolvers && Object.keys(boundResolvers).length > 0) {
+        const seedInput = Object.fromEntries(
+          Object.entries(rawParams).filter(([, v]) => v !== void 0)
+        );
+        const controller = createController(sdk);
+        let resolved;
+        try {
+          resolved = await controller.resolve({
+            method: functionInfo.name,
+            input: seedInput,
+            answer: interactiveMode ? answerViaCli : ({ state }) => {
+              throw new ZapierCliMissingParametersError([
+                {
+                  name: state.current?.join(".") ?? "value",
+                  isPositional: false
+                }
+              ]);
+            },
+            interactive: interactiveMode
+          });
+        } catch (err) {
+          if (err instanceof CoreCancelledSignal) {
+            throw new ZapierCliUserCancellationError();
+          }
+          throw err;
+        }
+        Object.assign(resolvedParams, resolved);
+      } else if (schema && !usesInputParameters) {
         const resolver = new SchemaParameterResolver();
         const resolved = await resolver.resolveParameters(
           schema,
@@ -2516,7 +2689,7 @@ ${confirmMessageAfter}`));
         }
       }
     } catch (error) {
-      success = false;
+      success = error instanceof ZapierCliError ? error.exitCode === 0 : false;
       errorMessage = error instanceof Error ? error.message : String(error);
       if (error instanceof ZapierCliMissingParametersError) {
         renderer.renderError(error);
@@ -4714,7 +4887,8 @@ async function runAccountAuth({
   });
   const scopedApi = getOrCreateApiClient({
     credentials: accessToken,
-    baseUrl: credentialsBaseUrl2
+    baseUrl: credentialsBaseUrl2,
+    callerPackage: sdk.context.options?.callerPackage
   });
   const profile = await getProfile(scopedApi);
   process.stderr.write(`${getProfileMessage(entryPoint, profile.email)}
@@ -7395,7 +7569,7 @@ function buildBoxLines(message) {
 // package.json with { type: 'json' }
 var package_default2 = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.61.0"};
+  version: "0.61.2"};
 
 // src/sdk.ts
 injectCliLogin(login_exports);
@@ -7472,6 +7646,9 @@ function createZapierCliSdk2(options = {}) {
 
 // src/utils/extensions.ts
 var ENV_VAR = "ZAPIER_SDK_EXTENSIONS";
+function isModelPlugin(value) {
+  return typeof value === "object" && value !== null && "pluginType" in value && typeof value.pluginType === "string";
+}
 async function resolveExtensions() {
   const seen = /* @__PURE__ */ new Set();
   const specs = readEnvSpecs().filter((spec) => {
@@ -7504,8 +7681,11 @@ function normalizeExtension(exported) {
   if (typeof exported === "function") {
     return [exported];
   }
+  if (isModelPlugin(exported)) {
+    return [exported];
+  }
   if (Array.isArray(exported)) {
-    if (exported.every((e) => typeof e === "function")) {
+    if (exported.every((e) => typeof e === "function" || isModelPlugin(e))) {
       return exported;
     }
     return null;

package/dist/experimental.cjs

@@ -2102,7 +2102,8 @@ async function runAccountAuth({
   });
   const scopedApi = zapierSdk.getOrCreateApiClient({
     credentials: accessToken,
-    baseUrl: credentialsBaseUrl
+    baseUrl: credentialsBaseUrl,
+    callerPackage: sdk.context.options?.callerPackage
   });
   const profile = await getProfile(scopedApi);
   process.stderr.write(`${getProfileMessage(entryPoint, profile.email)}
@@ -4740,7 +4741,7 @@ function collectDeprecationNoticeAndForward(event, onEvent) {
 // package.json with { type: 'json' }
 var package_default = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.61.0"};
+  version: "0.61.2"};
 
 // src/experimental.ts
 experimental.injectCliLogin(login_exports);

package/dist/experimental.d.mts

@@ -1,5 +1,5 @@
-import { ZapierSdkOptions, Plugin, PluginProvides } from '@zapier/zapier-sdk/experimental';
-import { Z as ZapierSdkCli } from './sdk-SOLizjno.mjs';
+import { ZapierSdkOptions } from '@zapier/zapier-sdk/experimental';
+import { E as Extension, Z as ZapierSdkCli } from './extensions-DggdwXJF.mjs';
 import '@zapier/zapier-sdk';
 import 'zod';
 
@@ -27,7 +27,7 @@ interface ZapierCliSdkOptions extends ZapierSdkOptions {
      * CLI plugins, so its functions appear in `getRegistry({ package: "cli" })`
      * automatically.
      */
-    extensions?: Plugin<unknown, PluginProvides>[];
+    extensions?: Extension[];
 }
 /**
  * Create a Zapier CLI SDK with experimental plugins registered. The

package/dist/experimental.d.ts

@@ -1,5 +1,5 @@
-import { ZapierSdkOptions, Plugin, PluginProvides } from '@zapier/zapier-sdk/experimental';
-import { Z as ZapierSdkCli } from './sdk-SOLizjno.js';
+import { ZapierSdkOptions } from '@zapier/zapier-sdk/experimental';
+import { E as Extension, Z as ZapierSdkCli } from './extensions-DggdwXJF.js';
 import '@zapier/zapier-sdk';
 import 'zod';
 
@@ -27,7 +27,7 @@ interface ZapierCliSdkOptions extends ZapierSdkOptions {
      * CLI plugins, so its functions appear in `getRegistry({ package: "cli" })`
      * automatically.
      */
-    extensions?: Plugin<unknown, PluginProvides>[];
+    extensions?: Extension[];
 }
 /**
  * Create a Zapier CLI SDK with experimental plugins registered. The

package/dist/experimental.mjs

@@ -2066,7 +2066,8 @@ async function runAccountAuth({
   });
   const scopedApi = getOrCreateApiClient({
     credentials: accessToken,
-    baseUrl: credentialsBaseUrl
+    baseUrl: credentialsBaseUrl,
+    callerPackage: sdk.context.options?.callerPackage
   });
   const profile = await getProfile(scopedApi);
   process.stderr.write(`${getProfileMessage(entryPoint, profile.email)}
@@ -4704,7 +4705,7 @@ function collectDeprecationNoticeAndForward(event, onEvent) {
 // package.json with { type: 'json' }
 var package_default = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.61.0"};
+  version: "0.61.2"};
 
 // src/experimental.ts
 injectCliLogin(login_exports);

package/dist/{sdk-SOLizjno.d.mts → extensions-DggdwXJF.d.mts}

@@ -1,5 +1,5 @@
 import * as _zapier_zapier_sdk from '@zapier/zapier-sdk';
-import { AppItem, Manifest, ResolvedCredentials, ApiClient, ZapierSdk } from '@zapier/zapier-sdk';
+import { AppItem, Manifest, ResolvedCredentials, ApiClient, ZapierSdk, Plugin, PluginProvides } from '@zapier/zapier-sdk';
 import { z } from 'zod';
 
 declare const BuildManifestSchema: z.ZodObject<{
@@ -521,6 +521,10 @@ interface AccountAuthCliContext {
     options?: {
         baseUrl?: string;
         credentials?: unknown;
+        callerPackage?: {
+            name: string;
+            version: string;
+        };
     };
 }
 
@@ -551,4 +555,13 @@ type SignupPluginProvides = ReturnType<typeof signupPlugin>;
 
 type ZapierSdkCli = ZapierSdk & BuildManifestPluginProvides & FeedbackPluginProvides & GenerateAppTypesPluginProvides & SignupPluginProvides;
 
-export type { ZapierSdkCli as Z };
+/** A new-model plugin descriptor (from `defineMethod` / `definePlugin` /
+ * `defineResolver` etc.), identified by its `pluginType` discriminant. */
+interface ModelPlugin {
+    readonly pluginType: string;
+}
+/** An extension is either a legacy function plugin or a new-model plugin
+ * descriptor; `addPlugin` accepts both. */
+type Extension = Plugin<unknown, PluginProvides> | ModelPlugin;
+
+export type { Extension as E, ZapierSdkCli as Z };

package/dist/{sdk-SOLizjno.d.ts → extensions-DggdwXJF.d.ts}

@@ -1,5 +1,5 @@
 import * as _zapier_zapier_sdk from '@zapier/zapier-sdk';
-import { AppItem, Manifest, ResolvedCredentials, ApiClient, ZapierSdk } from '@zapier/zapier-sdk';
+import { AppItem, Manifest, ResolvedCredentials, ApiClient, ZapierSdk, Plugin, PluginProvides } from '@zapier/zapier-sdk';
 import { z } from 'zod';
 
 declare const BuildManifestSchema: z.ZodObject<{
@@ -521,6 +521,10 @@ interface AccountAuthCliContext {
     options?: {
         baseUrl?: string;
         credentials?: unknown;
+        callerPackage?: {
+            name: string;
+            version: string;
+        };
     };
 }
 
@@ -551,4 +555,13 @@ type SignupPluginProvides = ReturnType<typeof signupPlugin>;
 
 type ZapierSdkCli = ZapierSdk & BuildManifestPluginProvides & FeedbackPluginProvides & GenerateAppTypesPluginProvides & SignupPluginProvides;
 
-export type { ZapierSdkCli as Z };
+/** A new-model plugin descriptor (from `defineMethod` / `definePlugin` /
+ * `defineResolver` etc.), identified by its `pluginType` discriminant. */
+interface ModelPlugin {
+    readonly pluginType: string;
+}
+/** An extension is either a legacy function plugin or a new-model plugin
+ * descriptor; `addPlugin` accepts both. */
+type Extension = Plugin<unknown, PluginProvides> | ModelPlugin;
+
+export type { Extension as E, ZapierSdkCli as Z };

package/dist/index.cjs

@@ -2101,7 +2101,8 @@ async function runAccountAuth({
   });
   const scopedApi = zapierSdk.getOrCreateApiClient({
     credentials: accessToken,
-    baseUrl: credentialsBaseUrl
+    baseUrl: credentialsBaseUrl,
+    callerPackage: sdk.context.options?.callerPackage
   });
   const profile = await getProfile(scopedApi);
   process.stderr.write(`${getProfileMessage(entryPoint, profile.email)}
@@ -4739,7 +4740,7 @@ function collectDeprecationNoticeAndForward(event, onEvent) {
 // package.json with { type: 'json' }
 var package_default = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.61.0"};
+  version: "0.61.2"};
 
 // src/sdk.ts
 zapierSdk.injectCliLogin(login_exports);
@@ -4779,7 +4780,7 @@ function createZapierCliSdk(options = {}) {
 
 // package.json
 var package_default2 = {
-  version: "0.61.0"};
+  version: "0.61.2"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { ZapierSdkOptions, Plugin, PluginProvides, BaseEvent } from '@zapier/zapier-sdk';
-import { Z as ZapierSdkCli } from './sdk-SOLizjno.mjs';
+import { ZapierSdkOptions, BaseEvent } from '@zapier/zapier-sdk';
+import { E as Extension, Z as ZapierSdkCli } from './extensions-DggdwXJF.mjs';
 import 'zod';
 
 interface ZapierCliSdkOptions extends ZapierSdkOptions {
@@ -10,7 +10,7 @@ interface ZapierCliSdkOptions extends ZapierSdkOptions {
      * CLI plugins, so its functions appear in `getRegistry({ package: "cli" })`
      * automatically.
      */
-    extensions?: Plugin<unknown, PluginProvides>[];
+    extensions?: Extension[];
 }
 /**
  * Create a Zapier SDK instance configured specifically for the CLI

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { ZapierSdkOptions, Plugin, PluginProvides, BaseEvent } from '@zapier/zapier-sdk';
-import { Z as ZapierSdkCli } from './sdk-SOLizjno.js';
+import { ZapierSdkOptions, BaseEvent } from '@zapier/zapier-sdk';
+import { E as Extension, Z as ZapierSdkCli } from './extensions-DggdwXJF.js';
 import 'zod';
 
 interface ZapierCliSdkOptions extends ZapierSdkOptions {
@@ -10,7 +10,7 @@ interface ZapierCliSdkOptions extends ZapierSdkOptions {
      * CLI plugins, so its functions appear in `getRegistry({ package: "cli" })`
      * automatically.
      */
-    extensions?: Plugin<unknown, PluginProvides>[];
+    extensions?: Extension[];
 }
 /**
  * Create a Zapier SDK instance configured specifically for the CLI

package/dist/index.mjs

@@ -2065,7 +2065,8 @@ async function runAccountAuth({
   });
   const scopedApi = getOrCreateApiClient({
     credentials: accessToken,
-    baseUrl: credentialsBaseUrl
+    baseUrl: credentialsBaseUrl,
+    callerPackage: sdk.context.options?.callerPackage
   });
   const profile = await getProfile(scopedApi);
   process.stderr.write(`${getProfileMessage(entryPoint, profile.email)}
@@ -4703,7 +4704,7 @@ function collectDeprecationNoticeAndForward(event, onEvent) {
 // package.json with { type: 'json' }
 var package_default = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.61.0"};
+  version: "0.61.2"};
 
 // src/sdk.ts
 injectCliLogin(login_exports);
@@ -4743,7 +4744,7 @@ function createZapierCliSdk(options = {}) {
 
 // package.json
 var package_default2 = {
-  version: "0.61.0"};
+  version: "0.61.2"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zapier/zapier-sdk-cli",
-  "version": "0.61.0",
+  "version": "0.61.2",
   "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.79.0",
-    "@zapier/zapier-sdk-mcp": "0.16.0"
+    "@zapier/zapier-sdk": "0.80.1",
+    "@zapier/zapier-sdk-mcp": "0.16.2"
   },
   "devDependencies": {
     "@types/express": "^5.0.3",