@zapier/zapier-sdk-cli 0.34.11 → 0.35.0

package/dist/cli.mjs

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 import { Command, CommanderError } from 'commander';
 import { z } from 'zod';
-import { createFunction, OutputPropertySchema, DEFAULT_CONFIG_PATH, injectCliLogin, createZapierSdkWithoutRegistry, registryPlugin, ZapierError, ZapierValidationError, ZapierUnknownError, batch, toSnakeCase, buildApplicationLifecycleEvent, formatErrorMessage, isCredentialsObject, isPositional, runWithTelemetryContext, getOsInfo, getPlatformVersions, getCiPlatform, isCi, getReleaseId, getCurrentTimestamp, generateEventId } from '@zapier/zapier-sdk';
+import { createFunction, OutputPropertySchema, DEFAULT_CONFIG_PATH, injectCliLogin, createZapierSdkWithoutRegistry, registryPlugin, ZapierError, ZapierValidationError, ZapierUnknownError, batch, toSnakeCase, buildApplicationLifecycleEvent, isCredentialsObject, isPositional, runWithTelemetryContext, formatErrorMessage, getOsInfo, getPlatformVersions, getCiPlatform, isCi, getReleaseId, getCurrentTimestamp, generateEventId } from '@zapier/zapier-sdk';
 import inquirer from 'inquirer';
-import chalk3 from 'chalk';
+import chalk7 from 'chalk';
 import util from 'util';
 import * as cliLogin from '@zapier/zapier-sdk-cli-login';
 import { logout, getConfigPath, getLoggedInUser, getPkceLoginConfig, AUTH_MODE_HEADER, getLoginStorageMode, updateLogin, getConfig } from '@zapier/zapier-sdk-cli-login';
@@ -45,8 +45,33 @@ var ZapierCliExitError = class extends ZapierCliError {
     this.exitCode = exitCode;
   }
 };
+var ZapierCliValidationError = class extends ZapierCliError {
+  constructor(message) {
+    super(message);
+    this.name = "ZapierCliValidationError";
+    this.code = "ZAPIER_CLI_VALIDATION_ERROR";
+    this.exitCode = 1;
+  }
+};
+var ZapierCliMissingParametersError = class extends ZapierCliError {
+  constructor(params) {
+    super(
+      `Missing required parameters: ${params.map((p) => p.name).join(", ")}`
+    );
+    this.name = "ZapierCliMissingParametersError";
+    this.code = "ZAPIER_CLI_MISSING_PARAMETERS";
+    this.exitCode = 1;
+    this.params = params;
+  }
+};
 
 // src/utils/parameter-resolver.ts
+function formatZodError(error) {
+  return error.issues.map((issue) => {
+    const field = issue.path.length > 0 ? issue.path.join(".") : "input";
+    return `${field}: ${issue.message}`;
+  }).join(", ");
+}
 function getLocalResolutionOrder(paramName, resolvers, resolved = /* @__PURE__ */ new Set()) {
   const resolver = resolvers[paramName];
   if (!resolver || resolver.type === "static") {
@@ -81,8 +106,9 @@ function getLocalResolutionOrderForParams(paramNames, resolvers) {
   return order;
 }
 var SchemaParameterResolver = class {
-  async resolveParameters(schema, providedParams, sdk2, functionName) {
+  async resolveParameters(schema, providedParams, sdk2, functionName, options) {
     return runWithTelemetryContext(async () => {
+      const interactiveMode = options?.interactiveMode ?? true;
       const parseResult = schema.safeParse(providedParams);
       const allParams = this.extractParametersFromSchema(schema);
       const resolvableParams = allParams.filter(
@@ -95,7 +121,7 @@ var SchemaParameterResolver = class {
       const functionallyRequired = missingResolvable.filter((param) => {
         if (param.isRequired) return true;
         if (param.name === "inputs") {
-          return true;
+          return interactiveMode;
         }
         return false;
       });
@@ -114,7 +140,7 @@ var SchemaParameterResolver = class {
       }
       if (functionallyRequired.length === 0 && alwaysPrompt.length === 0) {
         if (!parseResult.success) {
-          throw parseResult.error;
+          throw new ZapierCliValidationError(formatZodError(parseResult.error));
         }
         return parseResult.data;
       }
@@ -142,21 +168,30 @@ var SchemaParameterResolver = class {
           }
           return param;
         }).filter((param) => param !== void 0);
-        for (const param of orderedRequiredParams) {
-          try {
-            const value = await this.resolveParameter(
-              param,
-              context,
-              functionName
-            );
-            this.setNestedValue(resolvedParams, param.path, value);
-            context.resolvedParams = resolvedParams;
-          } catch (error) {
-            if (this.isUserCancellation(error)) {
-              console.log(chalk3.yellow("\n\nOperation cancelled by user"));
-              throw new ZapierCliUserCancellationError();
+        if (!interactiveMode) {
+          await this.resolveRequiredParamsNonInteractive(
+            orderedRequiredParams,
+            context,
+            resolvedParams,
+            functionName
+          );
+        } else {
+          for (const param of orderedRequiredParams) {
+            try {
+              const value = await this.resolveParameter(
+                param,
+                context,
+                functionName
+              );
+              this.setNestedValue(resolvedParams, param.path, value);
+              context.resolvedParams = resolvedParams;
+            } catch (error) {
+              if (this.isUserCancellation(error)) {
+                console.log(chalk7.yellow("\n\nOperation cancelled by user"));
+                throw new ZapierCliUserCancellationError();
+              }
+              throw error;
             }
-            throw error;
           }
         }
         const resolvedParamNames = new Set(
@@ -173,7 +208,7 @@ var SchemaParameterResolver = class {
           ...trulyOptional.filter((p) => !resolvedParamNames.has(p.name))
         );
       }
-      if (alwaysPrompt.length > 0) {
+      if (interactiveMode && alwaysPrompt.length > 0) {
         const alwaysPromptNames = alwaysPrompt.map((p) => p.name);
         const alwaysPromptResolutionOrder = getLocalResolutionOrderForParams(
           alwaysPromptNames,
@@ -191,14 +226,14 @@ var SchemaParameterResolver = class {
             context.resolvedParams = resolvedParams;
           } catch (error) {
             if (this.isUserCancellation(error)) {
-              console.log(chalk3.yellow("\n\nOperation cancelled by user"));
+              console.log(chalk7.yellow("\n\nOperation cancelled by user"));
               throw new ZapierCliUserCancellationError();
             }
             throw error;
           }
         }
       }
-      if (trulyOptional.length > 0) {
+      if (interactiveMode && trulyOptional.length > 0) {
         const optionalNames = trulyOptional.map((p) => p.name).join(", ");
         const shouldResolveOptional = await inquirer.prompt([
           {
@@ -228,7 +263,7 @@ var SchemaParameterResolver = class {
               context.resolvedParams = resolvedParams;
             } catch (error) {
               if (this.isUserCancellation(error)) {
-                console.log(chalk3.yellow("\n\nOperation cancelled by user"));
+                console.log(chalk7.yellow("\n\nOperation cancelled by user"));
                 throw new ZapierCliUserCancellationError();
               }
               throw error;
@@ -238,10 +273,9 @@ var SchemaParameterResolver = class {
       }
       const finalResult = schema.safeParse(resolvedParams);
       if (!finalResult.success) {
-        console.error(
-          chalk3.red("\u274C Parameter validation failed after resolution:")
+        throw new ZapierCliValidationError(
+          `Parameter validation failed: ${formatZodError(finalResult.error)}`
         );
-        throw finalResult.error;
       }
       return finalResult.data;
     });
@@ -283,6 +317,54 @@ var SchemaParameterResolver = class {
       isRequired
     };
   }
+  /**
+   * Calls `tryResolveWithoutPrompt` on a dynamic resolver.
+   * Returns the resolution result object, or null if unresolvable / throws.
+   * Note: { resolvedValue: null } is a valid result (e.g. connectionId when app has no auth);
+   * only a null return from the resolver itself means "could not auto-resolve".
+   */
+  async tryAutoResolve(dynamicResolver, context) {
+    if (!dynamicResolver.tryResolveWithoutPrompt) return null;
+    try {
+      return await dynamicResolver.tryResolveWithoutPrompt(
+        context.sdk,
+        context.resolvedParams
+      );
+    } catch (err) {
+      console.warn(
+        `Auto-resolver threw unexpectedly; treating as unresolved. Error: ${err instanceof Error ? err.message : String(err)}`
+      );
+      return null;
+    }
+  }
+  /**
+   * Non-interactive resolution: auto-resolves what it can via tryAutoResolve,
+   * throws ZapierCliMissingParametersError for anything that requires user input.
+   */
+  async resolveRequiredParamsNonInteractive(params, context, resolvedParams, functionName) {
+    const missingParams = [];
+    for (const param of params) {
+      const resolver = this.getResolver(param.name, context.sdk, functionName);
+      const autoResolution = resolver?.type === "dynamic" ? await this.tryAutoResolve(resolver, context) : null;
+      if (autoResolution != null) {
+        this.setNestedValue(
+          resolvedParams,
+          param.path,
+          autoResolution.resolvedValue
+        );
+        context.resolvedParams = resolvedParams;
+      } else {
+        missingParams.push({
+          name: param.name,
+          // Required params render as positional CLI args (<name>); so do explicitly positional optional params.
+          isPositional: param.isRequired || isPositional(param.schema)
+        });
+      }
+    }
+    if (missingParams.length > 0) {
+      throw new ZapierCliMissingParametersError(missingParams);
+    }
+  }
   async resolveParameter(param, context, functionName) {
     const resolver = this.getResolver(
       param.name,
@@ -292,7 +374,7 @@ var SchemaParameterResolver = class {
     if (!resolver) {
       throw new Error(`No resolver found for parameter: ${param.name}`);
     }
-    console.log(chalk3.blue(`
+    console.log(chalk7.blue(`
 \u{1F50D} Resolving ${param.name}...`));
     if (resolver.type === "static") {
       const staticResolver = resolver;
@@ -308,20 +390,15 @@ var SchemaParameterResolver = class {
       return answers[param.name];
     } else if (resolver.type === "dynamic") {
       const dynamicResolver = resolver;
-      if (dynamicResolver.tryResolveWithoutPrompt) {
-        try {
-          const preResolvedValue = await dynamicResolver.tryResolveWithoutPrompt(
-            context.sdk,
-            context.resolvedParams
-          );
-          if (preResolvedValue != null) {
-            return preResolvedValue.resolvedValue;
-          }
-        } catch {
-        }
+      const autoResolution = await this.tryAutoResolve(
+        dynamicResolver,
+        context
+      );
+      if (autoResolution != null) {
+        return autoResolution.resolvedValue;
       }
       if (param.isRequired && param.name !== "connectionId") {
-        console.log(chalk3.gray(`Fetching options for ${param.name}...`));
+        console.log(chalk7.gray(`Fetching options for ${param.name}...`));
       }
       const items = await dynamicResolver.fetch(
         context.sdk,
@@ -358,7 +435,7 @@ var SchemaParameterResolver = class {
         }
       };
       console.log(
-        chalk3.gray(
+        chalk7.gray(
           `Fetching input fields for ${param.name}${iteration > 1 ? ` (iteration ${iteration})` : ""}...`
         )
       );
@@ -369,7 +446,7 @@ var SchemaParameterResolver = class {
       if (!rootFieldItems || rootFieldItems.length === 0) {
         if (iteration === 1) {
           console.log(
-            chalk3.yellow(`No input fields required for this action.`)
+            chalk7.yellow(`No input fields required for this action.`)
           );
         }
         break;
@@ -391,7 +468,7 @@ var SchemaParameterResolver = class {
     }
     if (iteration >= maxIterations) {
       console.log(
-        chalk3.yellow(
+        chalk7.yellow(
           `
 \u26A0\uFE0F  Maximum field resolution iterations reached. Some dynamic fields may not have been discovered.`
         )
@@ -413,7 +490,7 @@ var SchemaParameterResolver = class {
         const fieldsetTitle = typedItem.title || typedItem.key;
         const pathDisplay = fieldsetPath.length > 0 ? ` (in ${fieldsetPath.join(" > ")})` : "";
         console.log(
-          chalk3.cyan(
+          chalk7.cyan(
             `
 \u{1F4C1} Processing fieldset: ${fieldsetTitle}${pathDisplay}`
           )
@@ -445,7 +522,7 @@ var SchemaParameterResolver = class {
           newRequiredCount++;
           if (newRequiredCount === 1 && fieldsetPath.length === 0) {
             console.log(
-              chalk3.blue(
+              chalk7.blue(
                 `
 \u{1F4DD} Please provide values for the following ${iteration === 1 ? "" : "additional "}input fields:`
               )
@@ -466,7 +543,7 @@ var SchemaParameterResolver = class {
       if (optionalFields.length > 0) {
         const pathContext = fieldsetPath.length > 0 ? ` in ${fieldsetPath.join(" > ")}` : "";
         console.log(
-          chalk3.gray(
+          chalk7.gray(
             `
 There are ${optionalFields.length} ${iteration === 1 ? "" : "additional "}optional field(s) available${pathContext}.`
           )
@@ -481,7 +558,7 @@ There are ${optionalFields.length} ${iteration === 1 ? "" : "additional "}option
             }
           ]);
           if (shouldConfigureOptional.configure) {
-            console.log(chalk3.cyan(`
+            console.log(chalk7.cyan(`
 Optional fields${pathContext}:`));
             for (const field of optionalFields) {
               await this.promptForField(field, targetInputs, context);
@@ -497,7 +574,7 @@ Optional fields${pathContext}:`));
           }
         } catch (error) {
           if (this.isUserCancellation(error)) {
-            console.log(chalk3.yellow("\n\nOperation cancelled by user"));
+            console.log(chalk7.yellow("\n\nOperation cancelled by user"));
             throw new ZapierCliUserCancellationError();
           }
           throw error;
@@ -552,7 +629,7 @@ Optional fields${pathContext}:`));
   async fetchChoices(fieldMeta, inputs, context, cursor) {
     try {
       console.log(
-        chalk3.gray(
+        chalk7.gray(
           cursor ? `  Fetching more choices...` : `  Fetching choices for ${fieldMeta.title}...`
         )
       );
@@ -571,7 +648,7 @@ Optional fields${pathContext}:`));
       }));
       if (choices.length === 0 && !cursor) {
         console.log(
-          chalk3.yellow(`  No choices available for ${fieldMeta.title}`)
+          chalk7.yellow(`  No choices available for ${fieldMeta.title}`)
         );
       }
       return {
@@ -580,7 +657,7 @@ Optional fields${pathContext}:`));
       };
     } catch (error) {
       console.warn(
-        chalk3.yellow(`  \u26A0\uFE0F  Failed to fetch choices for ${fieldMeta.title}:`),
+        chalk7.yellow(`  \u26A0\uFE0F  Failed to fetch choices for ${fieldMeta.title}:`),
         error
       );
       return { choices: [] };
@@ -606,7 +683,7 @@ Optional fields${pathContext}:`));
       }));
       if (nextCursor) {
         promptChoices.push({
-          name: chalk3.dim("(Load more...)"),
+          name: chalk7.dim("(Load more...)"),
           value: LOAD_MORE_SENTINEL
         });
       }
@@ -669,7 +746,7 @@ Optional fields${pathContext}:`));
       };
     }
     if (fieldMeta.description) {
-      promptConfig.prefix = chalk3.gray(`\u2139  ${fieldMeta.description}
+      promptConfig.prefix = chalk7.gray(`\u2139  ${fieldMeta.description}
 `);
     }
     try {
@@ -677,7 +754,7 @@ Optional fields${pathContext}:`));
       return answer[fieldMeta.key];
     } catch (error) {
       if (this.isUserCancellation(error)) {
-        console.log(chalk3.yellow("\n\nOperation cancelled by user"));
+        console.log(chalk7.yellow("\n\nOperation cancelled by user"));
         throw new ZapierCliUserCancellationError();
       }
       throw error;
@@ -695,7 +772,7 @@ Optional fields${pathContext}:`));
       }
     } catch (error) {
       if (this.isUserCancellation(error)) {
-        console.log(chalk3.yellow("\n\nOperation cancelled by user"));
+        console.log(chalk7.yellow("\n\nOperation cancelled by user"));
         throw new ZapierCliUserCancellationError();
       }
       throw error;
@@ -768,6 +845,91 @@ Optional fields${pathContext}:`));
     return functionInfo?.resolvers || {};
   }
 };
+
+// src/utils/cli-options.ts
+var RESERVED_CLI_OPTIONS = [
+  {
+    name: "version" /* Version */,
+    flag: "--version",
+    short: "-V",
+    description: "Display version number"
+  },
+  {
+    name: "help" /* Help */,
+    flag: "--help",
+    short: "-h",
+    description: "Display help for command"
+  }
+];
+function getReservedCliOption(name) {
+  const option = RESERVED_CLI_OPTIONS.find((opt) => opt.name === name);
+  if (!option) throw new Error(`Reserved CLI option not found: ${name}`);
+  return option;
+}
+var SHARED_COMMAND_CLI_OPTIONS = [
+  {
+    name: "json",
+    flag: "--json",
+    description: "Output raw JSON instead of formatted results"
+  }
+];
+
+// package.json
+var package_default = {
+  version: "0.35.0"};
+
+// src/telemetry/builders.ts
+function createCliBaseEvent(context = {}) {
+  return {
+    event_id: generateEventId(),
+    timestamp_ms: getCurrentTimestamp(),
+    release_id: getReleaseId(),
+    customuser_id: context.customuser_id ?? null,
+    account_id: context.account_id ?? null,
+    identity_id: context.identity_id ?? null,
+    visitor_id: context.visitor_id ?? null,
+    correlation_id: context.correlation_id ?? null
+  };
+}
+function buildCliCommandExecutedEvent({
+  data,
+  context = {},
+  cliVersion = package_default.version
+}) {
+  const osInfo = getOsInfo();
+  const platformVersions = getPlatformVersions();
+  return {
+    ...createCliBaseEvent(context),
+    system_name: "zapier-sdk-cli",
+    session_id: context.session_id ?? null,
+    cli_version: data.cli_version ?? cliVersion,
+    cli_arguments: data.cli_arguments ?? null,
+    cli_primary_command: data.cli_primary_command,
+    os_platform: osInfo.platform,
+    os_release: osInfo.release,
+    os_architecture: osInfo.architecture,
+    platform_versions: platformVersions,
+    selected_api: context.selected_api ?? null,
+    app_id: context.app_id ?? null,
+    app_version_id: context.app_version_id ?? null,
+    execution_duration_ms: data.execution_duration_ms ?? null,
+    success_flag: data.success_flag,
+    exit_code: data.exit_code ?? (data.success_flag ? 0 : 1),
+    error_message: data.error_message ?? null,
+    command_category: data.command_category ?? null,
+    requires_auth: null,
+    is_ci_environment: isCi(),
+    ci_platform: getCiPlatform(),
+    package_manager: data.package_manager ?? "pnpm",
+    // Default based on project setup
+    made_network_requests: data.made_network_requests ?? null,
+    files_modified_count: data.files_modified_count ?? null,
+    files_created_count: data.files_created_count ?? null,
+    files_processed_size_bytes: data.files_processed_size_bytes ?? null,
+    cpu_time_ms: data.cpu_time_ms ?? null,
+    subprocess_count: data.subprocess_count ?? null
+  };
+}
 function getFormatMetadata(schema) {
   return schema?._zod?.def?.formatMeta;
 }
@@ -799,7 +961,7 @@ function formatItemsFromSchema(functionInfo, items, startingNumber = 0) {
   });
 }
 function formatSingleItem(formatted, itemNumber) {
-  let titleLine = `${chalk3.gray(`${itemNumber + 1}.`)} ${chalk3.cyan(formatted.title)}`;
+  let titleLine = `${chalk7.gray(`${itemNumber + 1}.`)} ${chalk7.cyan(formatted.title)}`;
   const subtitleParts = [];
   if (formatted.keys) {
     subtitleParts.push(...formatted.keys);
@@ -811,11 +973,11 @@ function formatSingleItem(formatted, itemNumber) {
   }
   const uniqueParts = [...new Set(subtitleParts)];
   if (uniqueParts.length > 0) {
-    titleLine += ` ${chalk3.gray(`(${uniqueParts.join(", ")})`)}`;
+    titleLine += ` ${chalk7.gray(`(${uniqueParts.join(", ")})`)}`;
   }
   console.log(titleLine);
   if (formatted.description) {
-    console.log(`   ${chalk3.dim(formatted.description)}`);
+    console.log(`   ${chalk7.dim(formatted.description)}`);
   }
   if (formatted.data !== void 0) {
     formatJsonOutput(formatted.data);
@@ -831,16 +993,16 @@ function formatSingleItem(formatted, itemNumber) {
 function applyStyle(value, style) {
   switch (style) {
     case "dim":
-      return chalk3.dim(value);
+      return chalk7.dim(value);
     case "accent":
-      return chalk3.magenta(value);
+      return chalk7.magenta(value);
     case "warning":
-      return chalk3.red(value);
+      return chalk7.red(value);
     case "success":
-      return chalk3.green(value);
+      return chalk7.green(value);
     case "normal":
     default:
-      return chalk3.blue(value);
+      return chalk7.blue(value);
   }
 }
 function convertGenericItemToFormattedItem(item) {
@@ -860,93 +1022,229 @@ function formatItemsGeneric(items, startingNumber = 0) {
   });
 }
 
-// src/utils/cli-options.ts
-var RESERVED_CLI_OPTIONS = [
-  {
-    name: "version" /* Version */,
-    flag: "--version",
-    short: "-V",
-    description: "Display version number"
-  },
-  {
-    name: "help" /* Help */,
-    flag: "--help",
-    short: "-h",
-    description: "Display help for command"
-  }
-];
-function getReservedCliOption(name) {
-  const option = RESERVED_CLI_OPTIONS.find((opt) => opt.name === name);
-  if (!option) throw new Error(`Reserved CLI option not found: ${name}`);
-  return option;
+// src/utils/string-utils.ts
+function toKebabCase(str) {
+  return str.replace(/([A-Z]+)([A-Z][a-z])/g, "$1-$2").replace(/([a-z\d])([A-Z])/g, "$1-$2").toLowerCase();
 }
-var SHARED_COMMAND_CLI_OPTIONS = [
-  {
-    name: "json",
-    flag: "--json",
-    description: "Output raw JSON instead of formatted results"
+function formatMissingParamsError(error) {
+  return [
+    "Missing required parameters:",
+    ...error.params.map(
+      ({ name, isPositional: isPositional3 }) => isPositional3 ? `  \u2022 <${toKebabCase(name)}>` : `  \u2022 --${toKebabCase(name)}`
+    )
+  ].join("\n");
+}
+function buildJsonErrors(error) {
+  if (error instanceof ZapierCliMissingParametersError) {
+    return error.params.map(({ name, isPositional: isPositional3 }) => ({
+      code: error.code,
+      message: isPositional3 ? `<${toKebabCase(name)}> is required in non-interactive mode` : `--${toKebabCase(name)} is required in non-interactive mode`
+    }));
+  }
+  const code = error instanceof ZapierError ? error.code : "UNKNOWN_ERROR";
+  const message = error instanceof Error ? error.message : String(error);
+  return [{ code, message }];
+}
+async function unwrapHttpResponse(response) {
+  const text = await response.text().catch(() => "[unable to read body]");
+  try {
+    return {
+      statusCode: response.status,
+      headers: Object.fromEntries(response.headers.entries()),
+      body: JSON.parse(text)
+    };
+  } catch {
+    throw new Error(
+      `Failed to parse response as JSON (status: ${response.status}). Body: ${text.slice(0, 500)}`
+    );
   }
-];
-
-// package.json
-var package_default = {
-  version: "0.34.11"};
-
-// src/telemetry/builders.ts
-function createCliBaseEvent(context = {}) {
+}
+function outputJson(envelope) {
+  console.log(JSON.stringify(envelope, null, 2));
+}
+function createJsonRenderer() {
   return {
-    event_id: generateEventId(),
-    timestamp_ms: getCurrentTimestamp(),
-    release_id: getReleaseId(),
-    customuser_id: context.customuser_id ?? null,
-    account_id: context.account_id ?? null,
-    identity_id: context.identity_id ?? null,
-    visitor_id: context.visitor_id ?? null,
-    correlation_id: context.correlation_id ?? null
+    async renderPaginatedList(source, _functionInfo) {
+      let page;
+      if (Symbol.asyncIterator in Object(source)) {
+        const iter = source[Symbol.asyncIterator]();
+        const result = await iter.next();
+        page = result.done ? void 0 : result.value;
+      } else {
+        page = await source;
+      }
+      const data = Array.isArray(page?.data) ? page.data : [];
+      outputJson({
+        data,
+        ...page?.nextCursor && { nextCursor: page.nextCursor },
+        errors: []
+      });
+    },
+    renderCollectedList(items, _options) {
+      outputJson({ data: items, errors: [] });
+    },
+    renderItem(value, options) {
+      outputJson({
+        data: options?.outputFile ? { outputFile: options.outputFile } : value ?? null,
+        errors: []
+      });
+    },
+    async renderResponse(response) {
+      console.log(JSON.stringify(await unwrapHttpResponse(response), null, 2));
+    },
+    renderError(error) {
+      outputJson({ data: null, errors: buildJsonErrors(error) });
+      throw new ZapierCliExitError(
+        error instanceof Error ? error.message : String(error),
+        1
+      );
+    }
   };
 }
-function buildCliCommandExecutedEvent({
-  data,
-  context = {},
-  cliVersion = package_default.version
-}) {
-  const osInfo = getOsInfo();
-  const platformVersions = getPlatformVersions();
+function getItemName(functionInfo) {
+  if (functionInfo?.itemType) return `${functionInfo.itemType} items`;
+  return "items";
+}
+function getListTitle(functionInfo) {
+  if (functionInfo.itemType) return `Available ${functionInfo.itemType} items`;
+  return "items";
+}
+function renderItemsForDisplay(items, functionInfo, startingNumber = 0) {
+  if (functionInfo?.inputSchema) {
+    formatItemsFromSchema(
+      functionInfo,
+      items,
+      startingNumber
+    );
+  } else {
+    items.forEach((item, index) => {
+      const obj = item;
+      const name = obj?.name || obj?.key || obj?.id || "Item";
+      console.log(
+        `${chalk7.gray(`${startingNumber + index + 1}.`)} ${chalk7.cyan(String(name))}`
+      );
+      if (obj?.description)
+        console.log(`   ${chalk7.dim(String(obj.description))}`);
+      console.log();
+    });
+  }
+}
+function createInteractiveRenderer() {
   return {
-    ...createCliBaseEvent(context),
-    system_name: "zapier-sdk-cli",
-    session_id: context.session_id ?? null,
-    cli_version: data.cli_version ?? cliVersion,
-    cli_arguments: data.cli_arguments ?? null,
-    cli_primary_command: data.cli_primary_command,
-    os_platform: osInfo.platform,
-    os_release: osInfo.release,
-    os_architecture: osInfo.architecture,
-    platform_versions: platformVersions,
-    selected_api: context.selected_api ?? null,
-    app_id: context.app_id ?? null,
-    app_version_id: context.app_version_id ?? null,
-    execution_duration_ms: data.execution_duration_ms ?? null,
-    success_flag: data.success_flag,
-    exit_code: data.exit_code ?? (data.success_flag ? 0 : 1),
-    error_message: data.error_message ?? null,
-    command_category: data.command_category ?? null,
-    requires_auth: null,
-    is_ci_environment: isCi(),
-    ci_platform: getCiPlatform(),
-    package_manager: data.package_manager ?? "pnpm",
-    // Default based on project setup
-    made_network_requests: data.made_network_requests ?? null,
-    files_modified_count: data.files_modified_count ?? null,
-    files_created_count: data.files_created_count ?? null,
-    files_processed_size_bytes: data.files_processed_size_bytes ?? null,
-    cpu_time_ms: data.cpu_time_ms ?? null,
-    subprocess_count: data.subprocess_count ?? null
+    async renderPaginatedList(source, functionInfo) {
+      const itemName = getItemName(functionInfo);
+      if (!(Symbol.asyncIterator in Object(source))) {
+        const items = source?.data;
+        if (!Array.isArray(items) || items.length === 0) {
+          console.log(chalk7.yellow(`No ${itemName} found.`));
+          return;
+        }
+        renderItemsForDisplay(items, functionInfo, 0);
+        console.log(chalk7.green(`
+\u2705 Showing ${items.length} ${itemName}`));
+        return;
+      }
+      let totalShown = 0;
+      let pageCount = 0;
+      console.log(chalk7.blue(`\u{1F4CB} ${getListTitle(functionInfo)}
+`));
+      for await (const page of source) {
+        const items = page.data ?? [];
+        pageCount++;
+        if (items.length === 0 && pageCount === 1) {
+          console.log(chalk7.yellow(`No ${itemName} found.`));
+          return;
+        }
+        if (items.length === 0) break;
+        if (pageCount > 1) {
+          console.clear();
+          console.log(chalk7.blue(`\u{1F4CB} ${getListTitle(functionInfo)}
+`));
+        }
+        renderItemsForDisplay(items, functionInfo, totalShown);
+        totalShown += items.length;
+        console.log(
+          chalk7.green(
+            `
+\u2705 Showing ${totalShown} ${itemName} (page ${pageCount})`
+          )
+        );
+        if (page.nextCursor) {
+          const { continueReading } = await inquirer.prompt([
+            {
+              type: "confirm",
+              name: "continueReading",
+              message: "Load next page?",
+              default: true
+            }
+          ]);
+          if (!continueReading) break;
+        } else {
+          break;
+        }
+      }
+      console.log(chalk7.gray(`
+\u{1F4C4} Finished browsing ${itemName}`));
+    },
+    renderCollectedList(items, { maxItems, userSpecifiedMaxItems, functionInfo } = {}) {
+      if (!Array.isArray(items)) {
+        formatJsonOutput(items);
+        return;
+      }
+      const itemName = getItemName(functionInfo);
+      if (items.length === 0) {
+        console.log(chalk7.yellow(`No ${itemName} found.`));
+        return;
+      }
+      console.log(chalk7.green(`
+\u2705 Found ${items.length} ${itemName}:
+`));
+      renderItemsForDisplay(items, functionInfo);
+      if (userSpecifiedMaxItems && maxItems) {
+        console.log(
+          chalk7.gray(
+            `
+\u{1F4C4} Showing up to ${maxItems} ${itemName} (--max-items ${maxItems})`
+          )
+        );
+      } else {
+        console.log(chalk7.gray(`
+\u{1F4C4} All available ${itemName} shown`));
+      }
+    },
+    renderItem(value, options) {
+      if (options?.outputFile) {
+        const label = options.commandName ? `\u2705 ${options.commandName} completed successfully!` : "\u2705 Done!";
+        console.log(chalk7.green(label));
+        console.log(chalk7.gray(`Output written to: ${options.outputFile}`));
+      } else {
+        formatJsonOutput(value);
+      }
+    },
+    async renderResponse(response) {
+      formatJsonOutput(await unwrapHttpResponse(response));
+    },
+    renderError(error) {
+      if (error instanceof ZapierCliMissingParametersError) {
+        console.error(chalk7.red("\u274C " + formatMissingParamsError(error)));
+        console.error("\n" + chalk7.dim("Use --help to see available options"));
+        throw new ZapierCliExitError(error.message, 1);
+      }
+      if (error instanceof ZapierError) {
+        const formattedMessage = formatErrorMessage(error);
+        console.error(chalk7.red("\u274C Error:"), formattedMessage);
+        throw new ZapierCliExitError(formattedMessage, 1);
+      }
+      const msg = error instanceof Error ? error.message : "Unknown error";
+      console.error(chalk7.red("\u274C Error:"), msg);
+      throw new ZapierCliExitError(msg, 1);
+    }
   };
 }
 
 // src/utils/cli-generator.ts
 var CLI_COMMAND_EXECUTED_EVENT_SUBJECT = "platform.sdk.CliCommandExecutedEvent";
+var PAGINATION_PARAM_NAMES = /* @__PURE__ */ new Set(["maxItems", "pageSize", "cursor"]);
 var SENSITIVE_FLAGS = [
   "--credentials",
   "--credentials-client-secret",
@@ -977,6 +1275,62 @@ function sanitizeCliArguments(args) {
   }
   return sanitized;
 }
+function getNormalizedResult(result, { isListCommand }) {
+  if (result instanceof Response) {
+    return { kind: "response", value: result };
+  }
+  if (isListCommand) {
+    const sdkResult2 = result;
+    if (!Array.isArray(sdkResult2?.data)) {
+      throw new Error(
+        `List command returned unexpected shape (expected { data: [] }): ${JSON.stringify(result).slice(0, 200)}`
+      );
+    }
+    return {
+      kind: "list",
+      data: sdkResult2.data,
+      nextCursor: sdkResult2.nextCursor
+    };
+  }
+  const sdkResult = result;
+  return {
+    kind: "item",
+    value: result !== null && typeof result === "object" && "data" in result ? sdkResult.data : result
+  };
+}
+function hasItems(sdkResult) {
+  return sdkResult != null && typeof sdkResult.items === "function";
+}
+function hasPages(sdkResult) {
+  return sdkResult != null && typeof sdkResult[Symbol.asyncIterator] === "function";
+}
+async function* toItemsStream(sdkResult) {
+  if (hasItems(sdkResult)) {
+    yield* sdkResult.items();
+    return;
+  }
+  if (hasPages(sdkResult)) {
+    for await (const page of sdkResult) {
+      yield* page.data ?? [];
+    }
+    return;
+  }
+  throw new ZapierCliExitError(
+    `SDK method returned a value that is not async-iterable. Got: ${typeof sdkResult}. List methods must return an AsyncIterable or an object with an items() method.`,
+    1
+  );
+}
+async function collectItemsFromResult({
+  sdkResult,
+  maxItems
+}) {
+  const items = [];
+  for await (const item of toItemsStream(sdkResult)) {
+    items.push(item);
+    if (maxItems !== void 0 && items.length >= maxItems) break;
+  }
+  return maxItems !== void 0 ? items.slice(0, maxItems) : items;
+}
 var CONFIRM_MESSAGES = {
   "create-secret": {
     messageBefore: "You are about to create a sensitive secret that will be displayed as plain text.\nOnce created, you cannot retrieve it again.",
@@ -991,7 +1345,7 @@ async function promptConfirm(confirmType) {
     return { confirmed: true };
   }
   const { messageBefore, messageAfter } = CONFIRM_MESSAGES[confirmType];
-  console.log(chalk3.yellow(`
+  console.log(chalk7.yellow(`
 ${messageBefore}
 `));
   const { confirmed } = await inquirer.prompt([
@@ -1013,11 +1367,20 @@ function emitDeprecationWarning({
   }
   console.warn();
   console.warn(
-    chalk3.yellow.bold("\u26A0\uFE0F  DEPRECATION WARNING") + chalk3.yellow(` - \`${cliCommandName}\` is deprecated.`)
+    chalk7.yellow.bold("\u26A0\uFE0F  DEPRECATION WARNING") + chalk7.yellow(` - \`${cliCommandName}\` is deprecated.`)
   );
-  console.warn(chalk3.yellow(`   ${deprecation.message}`));
+  console.warn(chalk7.yellow(`   ${deprecation.message}`));
   console.warn();
 }
+function resolveOutputMode({
+  isListCommand,
+  hasPaginationParams,
+  hasUserSpecifiedMaxItems
+}) {
+  if (!isListCommand || !hasPaginationParams) return "single";
+  if (hasUserSpecifiedMaxItems) return "collect";
+  return "paginate";
+}
 function analyzeZodSchema(schema, functionInfo) {
   const parameters = [];
   const schemaDef = schema._zod?.def;
@@ -1157,9 +1520,6 @@ function reconstructPositionalArgs(inputParameters, flatParams) {
   }
   return args;
 }
-function toKebabCase(str) {
-  return str.replace(/([A-Z])/g, "-$1").toLowerCase();
-}
 function methodNameToCliCommand(methodName) {
   return toKebabCase(methodName);
 }
@@ -1249,23 +1609,31 @@ function createCommandConfig(cliCommandName, functionInfo, sdk2) {
     let success = true;
     let errorMessage = null;
     let resolvedParams = {};
+    const commandObj = args[args.length - 1];
+    const options = commandObj.opts();
+    const interactiveMode = !options.json;
+    const renderer = interactiveMode ? createInteractiveRenderer() : createJsonRenderer();
     try {
-      const commandObj = args[args.length - 1];
-      const options = commandObj.opts();
+      const commandObj2 = args[args.length - 1];
+      const options2 = commandObj2.opts();
       emitDeprecationWarning({
         cliCommandName,
         deprecation: functionInfo.deprecation
       });
       const isListCommand = functionInfo.type === "list";
       const hasPaginationParams = parameters.some(
-        (p) => p.name === "maxItems" || p.name === "pageSize"
+        (p) => PAGINATION_PARAM_NAMES.has(p.name)
       );
-      const hasUserSpecifiedMaxItems = "maxItems" in options && options.maxItems !== void 0;
-      const shouldUseJson = options.json;
+      const hasUserSpecifiedMaxItems = "maxItems" in options2 && options2.maxItems !== void 0;
+      const outputMode = resolveOutputMode({
+        isListCommand,
+        hasPaginationParams,
+        hasUserSpecifiedMaxItems
+      });
       const rawParams = convertCliArgsToSdkParams(
         parameters,
         args.slice(0, -1),
-        options
+        options2
       );
       if (schema && !usesInputParameters) {
         const resolver = new SchemaParameterResolver();
@@ -1273,128 +1641,96 @@ function createCommandConfig(cliCommandName, functionInfo, sdk2) {
           schema,
           rawParams,
           sdk2,
-          functionInfo.name
+          functionInfo.name,
+          { interactiveMode }
         );
       } else {
         resolvedParams = rawParams;
       }
       const confirm = functionInfo.confirm;
       let confirmMessageAfter;
-      if (confirm && !shouldUseJson) {
+      if (confirm && interactiveMode) {
         const confirmResult = await promptConfirm(confirm);
         if (!confirmResult.confirmed) {
-          console.log(chalk3.yellow("Operation cancelled."));
+          console.log(chalk7.yellow("Operation cancelled."));
           return;
         }
         confirmMessageAfter = confirmResult.messageAfter;
       }
-      if (isListCommand && hasPaginationParams && !shouldUseJson && !hasUserSpecifiedMaxItems) {
-        const sdkObj = sdk2;
-        const sdkIterable = sdkObj[functionInfo.name](resolvedParams);
-        await handlePaginatedListWithAsyncIteration(
-          functionInfo.name,
-          sdkIterable,
-          functionInfo
-        );
-      } else {
-        const hasOutputFile = resolvedParams.output;
-        if (hasOutputFile) {
-          const sdkObj = sdk2;
-          await sdkObj[functionInfo.name](resolvedParams);
-          console.log(
-            chalk3.green(`\u2705 ${cliCommandName} completed successfully!`)
-          );
-          console.log(chalk3.gray(`Output written to: ${hasOutputFile}`));
-          return;
-        }
-        let result;
-        if (usesInputParameters) {
-          const positionalArgs = reconstructPositionalArgs(
-            functionInfo.inputParameters,
-            resolvedParams
-          );
-          const sdkObj = sdk2;
-          result = await sdkObj[functionInfo.name](...positionalArgs);
-        } else {
-          const sdkObj = sdk2;
-          result = await sdkObj[functionInfo.name](resolvedParams);
-        }
-        if (result instanceof Response) {
-          const response = result;
-          let body;
-          const text = await response.text().catch(() => "[unable to read body]");
-          try {
-            body = JSON.parse(text);
-          } catch {
-            throw new Error(
-              `Failed to parse response as JSON (status: ${response.status}). Body: ${text.slice(0, 500)}`
-            );
-          }
-          result = {
-            statusCode: response.status,
-            headers: Object.fromEntries(response.headers.entries()),
-            body
-          };
+      const sdkMethod = sdk2[functionInfo.name];
+      switch (outputMode) {
+        case "paginate": {
+          const source = sdkMethod(resolvedParams);
+          await renderer.renderPaginatedList(source, functionInfo);
+          break;
         }
-        const items = result?.data ? result.data : result;
-        if (shouldUseJson) {
-          console.log(JSON.stringify(items, null, 2));
-        } else if (isListCommand) {
-          formatNonPaginatedResults(
-            items,
-            resolvedParams.maxItems,
-            hasUserSpecifiedMaxItems,
-            shouldUseJson,
+        case "collect": {
+          const maxItems = resolvedParams.maxItems;
+          const sdkResult = sdkMethod({ ...resolvedParams, maxItems });
+          const allItems = await collectItemsFromResult({
+            sdkResult,
+            maxItems
+          });
+          renderer.renderCollectedList(allItems, {
+            maxItems,
+            userSpecifiedMaxItems: hasUserSpecifiedMaxItems,
             functionInfo
-          );
-        } else {
-          formatJsonOutput(items);
+          });
+          break;
         }
-        if (confirmMessageAfter) {
-          console.log(chalk3.yellow(`
+        case "single": {
+          const callSdkMethod = () => {
+            if (usesInputParameters) {
+              const positionalArgs = reconstructPositionalArgs(
+                functionInfo.inputParameters,
+                resolvedParams
+              );
+              return sdkMethod(...positionalArgs);
+            }
+            return sdkMethod(resolvedParams);
+          };
+          const outputFile = resolvedParams.output;
+          if (outputFile) {
+            await callSdkMethod();
+            renderer.renderItem(null, {
+              outputFile,
+              commandName: cliCommandName
+            });
+            break;
+          }
+          const result = await callSdkMethod();
+          const normalizedResult = getNormalizedResult(result, {
+            isListCommand
+          });
+          if (normalizedResult.kind === "response") {
+            await renderer.renderResponse(normalizedResult.value);
+          } else if (normalizedResult.kind === "list") {
+            renderer.renderCollectedList(normalizedResult.data, {
+              maxItems: resolvedParams.maxItems,
+              userSpecifiedMaxItems: hasUserSpecifiedMaxItems,
+              functionInfo
+            });
+          } else {
+            renderer.renderItem(normalizedResult.value);
+          }
+          if (confirmMessageAfter) {
+            console.log(chalk7.yellow(`
 ${confirmMessageAfter}`));
+          }
+          break;
         }
       }
     } catch (error) {
       success = false;
       errorMessage = error instanceof Error ? error.message : String(error);
-      if (error instanceof Error && error.message.includes('"code"')) {
-        try {
-          const validationErrors = JSON.parse(error.message);
-          console.error(chalk3.red("\u274C Validation Error:"));
-          validationErrors.forEach((err) => {
-            const errorObj = err;
-            const field = errorObj?.path?.join(".") || "unknown";
-            console.error(
-              chalk3.yellow(
-                `  \u2022 ${field}: ${errorObj?.message || "Unknown error"}`
-              )
-            );
-          });
-          console.error(
-            "\n" + chalk3.dim(`Use --help to see available options`)
-          );
-          throw new ZapierCliExitError("Validation failed", 1);
-        } catch {
-          console.error(
-            chalk3.red("Error:"),
-            error instanceof Error ? error.message : String(error)
-          );
-          throw new ZapierCliExitError(
-            error instanceof Error ? error.message : String(error),
-            1
-          );
-        }
+      if (error instanceof ZapierCliMissingParametersError) {
+        renderer.renderError(error);
+      } else if (error instanceof ZapierCliValidationError) {
+        renderer.renderError(error);
       } else if (error instanceof ZapierCliError) {
         throw error;
-      } else if (error instanceof ZapierError) {
-        const formattedMessage = formatErrorMessage(error);
-        console.error(chalk3.red("\u274C Error:"), formattedMessage);
-        throw new ZapierCliExitError(formattedMessage, 1);
       } else {
-        const msg = error instanceof Error ? error.message : "Unknown error";
-        console.error(chalk3.red("\u274C Error:"), msg);
-        throw new ZapierCliExitError(msg, 1);
+        renderer.renderError(error);
       }
     } finally {
       try {
@@ -1423,7 +1759,8 @@ ${confirmMessageAfter}`));
     parameters,
     handler,
     hidden: functionInfo.categories?.includes("deprecated") ?? false,
-    aliases: functionInfo.aliases
+    aliases: functionInfo.aliases,
+    supportsJsonOutput: functionInfo.supportsJsonOutput
   };
 }
 function collect(value, previous = []) {
@@ -1434,7 +1771,7 @@ function addCommand(program2, commandName, config) {
   const command = program2.command(commandName, { hidden: config.hidden ?? false }).description(config.description);
   let hasPositionalArray = false;
   config.parameters.forEach((param) => {
-    const kebabName = param.name.replace(/([A-Z])/g, "-$1").toLowerCase();
+    const kebabName = toKebabCase(param.name);
     if (param.hasResolver && param.required) {
       command.argument(
         `[${kebabName}]`,
@@ -1489,9 +1826,9 @@ function addCommand(program2, commandName, config) {
   });
   const paramNames = new Set(config.parameters.map((p) => p.name));
   SHARED_COMMAND_CLI_OPTIONS.forEach((opt) => {
-    if (!paramNames.has(opt.name)) {
-      command.option(opt.flag, opt.description);
-    }
+    if (paramNames.has(opt.name)) return;
+    if (config.supportsJsonOutput === false && opt.name === "json") return;
+    command.option(opt.flag, opt.description);
   });
   command.action(config.handler);
 }
@@ -1552,161 +1889,6 @@ function convertValue(value, type) {
       return value;
   }
 }
-async function handlePaginatedListWithAsyncIteration(sdkMethodName, sdkResult, functionInfo) {
-  const itemName = getItemNameFromMethod(functionInfo);
-  let totalShown = 0;
-  let pageCount = 0;
-  console.log(
-    chalk3.blue(`\u{1F4CB} ${getListTitleFromMethod(sdkMethodName, functionInfo)}
-`)
-  );
-  try {
-    for await (const page of sdkResult) {
-      const items = page.data || page;
-      pageCount++;
-      if (!Array.isArray(items)) {
-        console.log(chalk3.yellow(`No ${itemName} found.`));
-        return;
-      }
-      if (items.length === 0 && pageCount === 1) {
-        console.log(chalk3.yellow(`No ${itemName} found.`));
-        return;
-      }
-      if (items.length === 0) {
-        break;
-      }
-      if (pageCount > 1) {
-        console.clear();
-        console.log(
-          chalk3.blue(
-            `\u{1F4CB} ${getListTitleFromMethod(sdkMethodName, functionInfo)}
-`
-          )
-        );
-      }
-      if (functionInfo && functionInfo.inputSchema) {
-        formatItemsFromSchema(
-          functionInfo,
-          items,
-          totalShown
-        );
-      } else {
-        formatItemsGeneric2(items, totalShown);
-      }
-      totalShown += items.length;
-      console.log(
-        chalk3.green(
-          `
-\u2705 Showing ${totalShown} ${itemName} (page ${pageCount})`
-        )
-      );
-      if (page.nextCursor) {
-        const { continueReading } = await inquirer.prompt([
-          {
-            type: "confirm",
-            name: "continueReading",
-            message: `Load next page?`,
-            default: true
-          }
-        ]);
-        if (!continueReading) {
-          break;
-        }
-      } else {
-        break;
-      }
-    }
-    console.log(chalk3.gray(`
-\u{1F4C4} Finished browsing ${itemName}`));
-  } catch (error) {
-    const items = sdkResult?.data || sdkResult;
-    if (Array.isArray(items)) {
-      if (items.length === 0) {
-        console.log(chalk3.yellow(`No ${itemName} found.`));
-        return;
-      }
-      if (functionInfo && functionInfo.inputSchema) {
-        formatItemsFromSchema(
-          functionInfo,
-          items,
-          0
-        );
-      } else {
-        formatItemsGeneric2(items, 0);
-      }
-      console.log(chalk3.green(`
-\u2705 Showing ${items.length} ${itemName}`));
-    } else {
-      throw error;
-    }
-  }
-}
-function formatNonPaginatedResults(result, requestedMaxItems, userSpecifiedMaxItems, useRawJson, functionInfo) {
-  if (!Array.isArray(result)) {
-    if (useRawJson) {
-      console.log(JSON.stringify(result, null, 2));
-    } else {
-      formatJsonOutput(result);
-    }
-    return;
-  }
-  if (useRawJson) {
-    console.log(JSON.stringify(result, null, 2));
-    return;
-  }
-  const itemName = functionInfo ? getItemNameFromMethod(functionInfo) : "items";
-  if (result.length === 0) {
-    console.log(chalk3.yellow(`No ${itemName} found.`));
-    return;
-  }
-  console.log(chalk3.green(`
-\u2705 Found ${result.length} ${itemName}:
-`));
-  if (functionInfo && functionInfo.inputSchema) {
-    formatItemsFromSchema(
-      functionInfo,
-      result
-    );
-  } else {
-    formatItemsGeneric2(result);
-  }
-  if (userSpecifiedMaxItems && requestedMaxItems) {
-    console.log(
-      chalk3.gray(
-        `
-\u{1F4C4} Showing up to ${requestedMaxItems} ${itemName} (--max-items ${requestedMaxItems})`
-      )
-    );
-  } else {
-    console.log(chalk3.gray(`
-\u{1F4C4} All available ${itemName} shown`));
-  }
-}
-function formatItemsGeneric2(items, startingNumber = 0) {
-  items.forEach((item, index) => {
-    const itemObj = item;
-    const name = itemObj?.name || itemObj?.key || itemObj?.id || "Item";
-    console.log(
-      `${chalk3.gray(`${startingNumber + index + 1}.`)} ${chalk3.cyan(String(name))}`
-    );
-    if (itemObj?.description) {
-      console.log(`   ${chalk3.dim(String(itemObj.description))}`);
-    }
-    console.log();
-  });
-}
-function getItemNameFromMethod(functionInfo) {
-  if (functionInfo.itemType) {
-    return `${functionInfo.itemType} items`;
-  }
-  return "items";
-}
-function getListTitleFromMethod(methodName, functionInfo) {
-  if (functionInfo.itemType) {
-    return `Available ${functionInfo.itemType} items`;
-  }
-  return `${methodName} items`;
-}
 var LOGIN_PORTS = [49505, 50575, 52804, 55981, 61010, 63851];
 var LOGIN_TIMEOUT_MS = 3e5;
 var spinPromise = async (promise, text) => {
@@ -1726,20 +1908,20 @@ var spinPromise = async (promise, text) => {
 };
 var log = {
   info: (message, ...args) => {
-    console.log(chalk3.blue("\u2139"), message, ...args);
+    console.log(chalk7.blue("\u2139"), message, ...args);
   },
   error: (message, ...args) => {
-    console.error(chalk3.red("\u2716"), message, ...args);
+    console.error(chalk7.red("\u2716"), message, ...args);
   },
   success: (message, ...args) => {
-    console.log(chalk3.green("\u2713"), message, ...args);
+    console.log(chalk7.green("\u2713"), message, ...args);
   },
   warn: (message, ...args) => {
-    console.log(chalk3.yellow("\u26A0"), message, ...args);
+    console.log(chalk7.yellow("\u26A0"), message, ...args);
   },
   debug: (message, ...args) => {
     if (process.env.DEBUG === "true" || process.argv.includes("--debug")) {
-      console.log(chalk3.gray("\u{1F41B}"), message, ...args);
+      console.log(chalk7.gray("\u{1F41B}"), message, ...args);
     }
   }
 };
@@ -2002,9 +2184,10 @@ var loginPlugin = ({
     const user = await getLoggedInUser();
     context.eventEmission.emit(
       "platform.sdk.ApplicationLifecycleEvent",
-      buildApplicationLifecycleEvent({
-        lifecycle_event_type: "login_success"
-      })
+      buildApplicationLifecycleEvent(
+        { lifecycle_event_type: "login_success" },
+        { customuser_id: user.customUserId, account_id: user.accountId }
+      )
     );
     console.log(`\u2705 Successfully logged in as ${user.email}`);
   };
@@ -2014,7 +2197,8 @@ var loginPlugin = ({
       meta: {
         login: {
           categories: ["account"],
-          inputSchema: LoginSchema
+          inputSchema: LoginSchema,
+          supportsJsonOutput: false
         }
       }
     }
@@ -2033,7 +2217,8 @@ var logoutPlugin = () => ({
     meta: {
       logout: {
         categories: ["account"],
-        inputSchema: LogoutSchema
+        inputSchema: LogoutSchema,
+        supportsJsonOutput: false
       }
     }
   }
@@ -3804,7 +3989,7 @@ function buildTemplateVariables({
   };
 }
 function cleanupProject({ projectDir }) {
-  console.log("\n" + chalk3.yellow("!") + "  Cleaning up...");
+  console.log("\n" + chalk7.yellow("!") + "  Cleaning up...");
   rmSync(projectDir, { recursive: true, force: true });
 }
 async function withInterruptCleanup(cleanup, fn) {
@@ -4014,8 +4199,8 @@ function buildNextSteps({
 }
 function createConsoleDisplayHooks() {
   return {
-    onItemComplete: (message) => console.log("   " + chalk3.green("\u2713") + "  " + chalk3.dim(message)),
-    onWarn: (message) => console.warn(chalk3.yellow("!") + "  " + message),
+    onItemComplete: (message) => console.log("   " + chalk7.green("\u2713") + "  " + chalk7.dim(message)),
+    onWarn: (message) => console.warn(chalk7.yellow("!") + "  " + message),
     onStepStart: ({
       description,
       stepNumber,
@@ -4024,31 +4209,31 @@ function createConsoleDisplayHooks() {
       skipPrompts
     }) => {
       const progressMessage = `${description}...`;
-      const stepCounter = chalk3.dim(`${stepNumber}/${totalSteps}`);
+      const stepCounter = chalk7.dim(`${stepNumber}/${totalSteps}`);
       if (skipPrompts) {
         console.log(
-          "\n" + chalk3.bold(`\u276F  ${progressMessage}`) + "  " + stepCounter + "\n"
+          "\n" + chalk7.bold(`\u276F  ${progressMessage}`) + "  " + stepCounter + "\n"
         );
       } else {
         console.log(
-          chalk3.dim("\u2192") + "  " + progressMessage + "  " + stepCounter
+          chalk7.dim("\u2192") + "  " + progressMessage + "  " + stepCounter
         );
       }
       if (command) {
-        console.log("   " + chalk3.cyan(`$ ${command}`));
+        console.log("   " + chalk7.cyan(`$ ${command}`));
       }
     },
     onStepSuccess: ({ stepNumber, totalSteps }) => console.log(
-      "\n" + chalk3.green("\u2713") + "  " + chalk3.dim(`Step ${stepNumber}/${totalSteps} complete`) + "\n"
+      "\n" + chalk7.green("\u2713") + "  " + chalk7.dim(`Step ${stepNumber}/${totalSteps} complete`) + "\n"
     ),
     onStepError: ({ description, command, err }) => {
       const detail = err instanceof Error && err.message ? `
-   ${chalk3.dim(err.message)}` : "";
+   ${chalk7.dim(err.message)}` : "";
       const hint = command ? `
-   ${chalk3.dim("run manually:")} ${chalk3.cyan(`$ ${command}`)}` : "";
+   ${chalk7.dim("run manually:")} ${chalk7.cyan(`$ ${command}`)}` : "";
       console.error(
         `
-${chalk3.red("\u2716")}  ${chalk3.bold(description)}${chalk3.dim(" failed")}${detail}${hint}`
+${chalk7.red("\u2716")}  ${chalk7.bold(description)}${chalk7.dim(" failed")}${detail}${hint}`
       );
     }
   };
@@ -4060,22 +4245,22 @@ function displaySummaryAndNextSteps({
   packageManager
 }) {
   const formatStatus = (complete) => ({
-    icon: complete ? chalk3.green("\u2713") : chalk3.yellow("!"),
-    text: complete ? chalk3.green("Setup complete") : chalk3.yellow("Setup interrupted")
+    icon: complete ? chalk7.green("\u2713") : chalk7.yellow("!"),
+    text: complete ? chalk7.green("Setup complete") : chalk7.yellow("Setup interrupted")
   });
-  const formatNextStep = (step, i) => "   " + chalk3.dim(`${i + 1}.`) + "  " + chalk3.bold(step.description);
-  const formatCommand = (cmd) => "       " + chalk3.cyan(`$ ${cmd}`);
-  const formatCompletedStep = (step) => "   " + chalk3.green("\u2713") + "  " + step.description;
+  const formatNextStep = (step, i) => "   " + chalk7.dim(`${i + 1}.`) + "  " + chalk7.bold(step.description);
+  const formatCommand = (cmd) => "       " + chalk7.cyan(`$ ${cmd}`);
+  const formatCompletedStep = (step) => "   " + chalk7.green("\u2713") + "  " + step.description;
   const { execCmd } = getPackageManagerCommands({ packageManager });
   const leftoverSteps = steps.filter(
     (s) => !completedSetupStepIds.includes(s.id)
   );
   const isComplete = leftoverSteps.length === 0;
   const status = formatStatus(isComplete);
-  console.log("\n" + chalk3.bold("\u276F  Summary") + "\n");
-  console.log("   " + chalk3.dim("Project") + "   " + chalk3.bold(projectName));
+  console.log("\n" + chalk7.bold("\u276F  Summary") + "\n");
+  console.log("   " + chalk7.dim("Project") + "   " + chalk7.bold(projectName));
   console.log(
-    "   " + chalk3.dim("Status") + "    " + status.icon + "  " + status.text
+    "   " + chalk7.dim("Status") + "    " + status.icon + "  " + status.text
   );
   const completedSteps = steps.filter(
     (s) => completedSetupStepIds.includes(s.id)
@@ -4085,7 +4270,7 @@ function displaySummaryAndNextSteps({
     for (const step of completedSteps) console.log(formatCompletedStep(step));
   }
   const nextSteps = buildNextSteps({ projectName, leftoverSteps, execCmd });
-  console.log("\n" + chalk3.bold("\u276F  Next Steps") + "\n");
+  console.log("\n" + chalk7.bold("\u276F  Next Steps") + "\n");
   nextSteps.forEach((step, i) => {
     console.log(formatNextStep(step, i));
     if (step.command) console.log(formatCommand(step.command));
@@ -4147,7 +4332,8 @@ var initPlugin = () => {
       meta: {
         init: {
           categories: ["utility"],
-          inputSchema: InitSchema
+          inputSchema: InitSchema,
+          supportsJsonOutput: false
         }
       }
     }
@@ -4166,7 +4352,7 @@ function createZapierCliSdk(options = {}) {
 // package.json with { type: 'json' }
 var package_default2 = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.34.11"};
+  version: "0.35.0"};
 var ONE_DAY_MS = 24 * 60 * 60 * 1e3;
 var CACHE_RESET_INTERVAL_MS = (() => {
   const { ZAPIER_SDK_UPDATE_CHECK_INTERVAL_MS = `${ONE_DAY_MS}` } = process.env;
@@ -4276,26 +4462,26 @@ function displayUpdateNotification(versionInfo, packageName) {
   if (versionInfo.isDeprecated) {
     console.error();
     console.error(
-      chalk3.red.bold("\u26A0\uFE0F  DEPRECATION WARNING") + chalk3.red(
+      chalk7.red.bold("\u26A0\uFE0F  DEPRECATION WARNING") + chalk7.red(
         ` - ${packageName} v${versionInfo.currentVersion} is deprecated.`
       )
     );
     if (versionInfo.deprecationMessage) {
-      console.error(chalk3.red(`   ${versionInfo.deprecationMessage}`));
+      console.error(chalk7.red(`   ${versionInfo.deprecationMessage}`));
     }
-    console.error(chalk3.red(`   Please update to the latest version.`));
+    console.error(chalk7.red(`   Please update to the latest version.`));
     console.error();
   }
   if (versionInfo.hasUpdate) {
     console.error();
     console.error(
-      chalk3.yellow.bold("\u{1F4E6} Update available!") + chalk3.yellow(
+      chalk7.yellow.bold("\u{1F4E6} Update available!") + chalk7.yellow(
         ` ${packageName} v${versionInfo.currentVersion} \u2192 v${versionInfo.latestVersion}`
       )
     );
     console.error(
-      chalk3.yellow(
-        `   Run ${chalk3.bold(getUpdateCommand(packageName))} to update.`
+      chalk7.yellow(
+        `   Run ${chalk7.bold(getUpdateCommand(packageName))} to update.`
       )
     );
     console.error();