@zapier/zapier-sdk-cli 0.34.1 → 0.34.4

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import * as cliLogin from '@zapier/zapier-sdk-cli-login';
 import { logout, getConfigPath, getLoggedInUser, getPkceLoginConfig, AUTH_MODE_HEADER, getLoginStorageMode, updateLogin } from '@zapier/zapier-sdk-cli-login';
-import { createFunction, OutputPropertySchema, DEFAULT_CONFIG_PATH, injectCliLogin, getOsInfo, getPlatformVersions, getCiPlatform, isCi, createZapierSdkWithoutRegistry, registryPlugin, getReleaseId, getCurrentTimestamp, generateEventId, ZapierValidationError, ZapierUnknownError, batch, toSnakeCase, ZapierError, isCredentialsObject } from '@zapier/zapier-sdk';
+import { createFunction, OutputPropertySchema, DEFAULT_CONFIG_PATH, injectCliLogin, createZapierSdkWithoutRegistry, registryPlugin, getOsInfo, getPlatformVersions, getCiPlatform, isCi, ZapierValidationError, ZapierUnknownError, getReleaseId, getCurrentTimestamp, generateEventId, batch, toSnakeCase, ZapierError, isCredentialsObject } from '@zapier/zapier-sdk';
 import open from 'open';
 import crypto, { createHash } from 'crypto';
 import express from 'express';
@@ -309,65 +309,7 @@ var LoginSchema = z.object({
   timeout: z.string().optional().describe("Login timeout in seconds (default: 300)")
 }).describe("Log in to Zapier to access your account");
 
-// package.json
-var package_default = {
-  version: "0.34.1"};
-
-// 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: data.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
-  };
-}
-
 // src/plugins/login/index.ts
-var CLI_COMMAND_EXECUTED_EVENT_SUBJECT = "platform.sdk.CliCommandExecutedEvent";
 function toPkceCredentials(credentials) {
   if (credentials && isCredentialsObject(credentials) && !("clientSecret" in credentials)) {
     return {
@@ -379,63 +321,25 @@ function toPkceCredentials(credentials) {
   }
   return void 0;
 }
-var loginPlugin = ({ context }) => {
-  const loginWithTelemetry = async (options) => {
-    const startTime = Date.now();
-    let success = false;
-    let errorMessage = null;
-    let accountId = null;
-    let customUserId = null;
-    try {
-      const timeoutSeconds = options.timeout ? parseInt(options.timeout, 10) : 300;
-      if (isNaN(timeoutSeconds) || timeoutSeconds <= 0) {
-        throw new Error("Timeout must be a positive number");
-      }
-      const resolvedCredentials = await context.resolveCredentials();
-      const pkceCredentials = toPkceCredentials(resolvedCredentials);
-      await login_default({
-        timeoutMs: timeoutSeconds * 1e3,
-        credentials: pkceCredentials
-      });
-      const user = await getLoggedInUser();
-      accountId = user.accountId;
-      customUserId = user.customUserId;
-      console.log(`\u2705 Successfully logged in as ${user.email}`);
-      success = true;
-    } catch (error) {
-      success = false;
-      errorMessage = error instanceof Error ? error.message : "Login failed";
-      throw error;
-    } finally {
-      const event = buildCliCommandExecutedEvent({
-        data: {
-          cli_primary_command: "login",
-          success_flag: success,
-          execution_duration_ms: Date.now() - startTime,
-          exit_code: success ? 0 : 1,
-          error_message: errorMessage,
-          command_category: "authentication",
-          requires_auth: false,
-          cli_arguments: [
-            "login",
-            options.timeout ? `--timeout=${options.timeout}` : null
-          ].filter(Boolean)
-        },
-        context: {
-          session_id: context.session_id,
-          selected_api: context.selected_api,
-          app_id: context.app_id,
-          app_version_id: context.app_version_id,
-          customuser_id: customUserId,
-          account_id: accountId
-        },
-        cliVersion: package_default.version
-      });
-      context.eventEmission.emit(CLI_COMMAND_EXECUTED_EVENT_SUBJECT, event);
-    }
+var loginPlugin = ({
+  context
+}) => {
+  const loginFn = async (options) => {
+    const timeoutSeconds = options.timeout ? parseInt(options.timeout, 10) : 300;
+    if (isNaN(timeoutSeconds) || timeoutSeconds <= 0) {
+      throw new Error("Timeout must be a positive number");
+    }
+    const resolvedCredentials = await context.resolveCredentials();
+    const pkceCredentials = toPkceCredentials(resolvedCredentials);
+    await login_default({
+      timeoutMs: timeoutSeconds * 1e3,
+      credentials: pkceCredentials
+    });
+    const user = await getLoggedInUser();
+    console.log(`\u2705 Successfully logged in as ${user.email}`);
   };
   return {
-    login: loginWithTelemetry,
+    login: loginFn,
     context: {
       meta: {
         login: {
@@ -2559,6 +2463,63 @@ function createZapierCliSdk(options = {}) {
   }).addPlugin(generateAppTypesPlugin).addPlugin(buildManifestPlugin).addPlugin(bundleCodePlugin).addPlugin(getLoginConfigPathPlugin).addPlugin(addPlugin).addPlugin(feedbackPlugin).addPlugin(curlPlugin).addPlugin(initPlugin).addPlugin(mcpPlugin).addPlugin(loginPlugin).addPlugin(logoutPlugin).addPlugin(cliOverridesPlugin).addPlugin(registryPlugin);
 }
 
+// package.json
+var package_default = {
+  version: "0.34.4"};
+
+// 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: data.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
+  };
+}
+
 // src/utils/cli-options.ts
 var ReservedCliParameter = /* @__PURE__ */ ((ReservedCliParameter2) => {
   ReservedCliParameter2["Version"] = "version";

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zapier/zapier-sdk-cli",
-    "version": "0.34.1",
+    "version": "0.34.4",
     "description": "Command line interface for Zapier SDK",
     "main": "dist/index.cjs",
     "module": "dist/index.mjs",

package/dist/src/plugins/login/index.d.ts

@@ -1,5 +1,4 @@
 import type { Plugin, ResolvedCredentials } from "@zapier/zapier-sdk";
-import type { EventEmissionContext } from "@zapier/zapier-sdk";
 import { LoginSchema, type LoginOptions } from "./schemas";
 interface CliContext {
     session_id?: string | null;
@@ -19,5 +18,5 @@ interface LoginPluginProvides {
         };
     };
 }
-export declare const loginPlugin: Plugin<{}, EventEmissionContext & CliContext, LoginPluginProvides>;
+export declare const loginPlugin: Plugin<{}, CliContext, LoginPluginProvides>;
 export type { LoginPluginProvides };

package/dist/src/plugins/login/index.js

@@ -2,9 +2,6 @@ import { isCredentialsObject } from "@zapier/zapier-sdk";
 import login from "../../utils/auth/login";
 import { getLoggedInUser, } from "@zapier/zapier-sdk-cli-login";
 import { LoginSchema } from "./schemas";
-import { buildCliCommandExecutedEvent } from "../../telemetry/builders";
-import cliPackageJson from "../../../package.json";
-const CLI_COMMAND_EXECUTED_EVENT_SUBJECT = "platform.sdk.CliCommandExecutedEvent";
 function toPkceCredentials(credentials) {
     if (credentials &&
         isCredentialsObject(credentials) &&
@@ -18,71 +15,25 @@ function toPkceCredentials(credentials) {
     }
     return undefined;
 }
-export const loginPlugin = ({ context }) => {
-    // Wrap the login function to emit telemetry events
-    const loginWithTelemetry = async (options) => {
-        const startTime = Date.now();
-        let success = false;
-        let errorMessage = null;
-        let accountId = null;
-        let customUserId = null;
-        try {
-            const timeoutSeconds = options.timeout
-                ? parseInt(options.timeout, 10)
-                : 300;
-            if (isNaN(timeoutSeconds) || timeoutSeconds <= 0) {
-                throw new Error("Timeout must be a positive number");
-            }
-            // Resolve credentials from options and env vars
-            const resolvedCredentials = await context.resolveCredentials();
-            const pkceCredentials = toPkceCredentials(resolvedCredentials);
-            await login({
-                timeoutMs: timeoutSeconds * 1000,
-                credentials: pkceCredentials,
-            });
-            // Get user info after successful login
-            const user = await getLoggedInUser();
-            accountId = user.accountId;
-            customUserId = user.customUserId;
-            console.log(`✅ Successfully logged in as ${user.email}`);
-            success = true;
-        }
-        catch (error) {
-            success = false;
-            errorMessage = error instanceof Error ? error.message : "Login failed";
-            throw error;
-        }
-        finally {
-            // Emit CLI command executed event if event emission is available
-            const event = buildCliCommandExecutedEvent({
-                data: {
-                    cli_primary_command: "login",
-                    success_flag: success,
-                    execution_duration_ms: Date.now() - startTime,
-                    exit_code: success ? 0 : 1,
-                    error_message: errorMessage,
-                    command_category: "authentication",
-                    requires_auth: false,
-                    cli_arguments: [
-                        "login",
-                        options.timeout ? `--timeout=${options.timeout}` : null,
-                    ].filter(Boolean),
-                },
-                context: {
-                    session_id: context.session_id,
-                    selected_api: context.selected_api,
-                    app_id: context.app_id,
-                    app_version_id: context.app_version_id,
-                    customuser_id: customUserId,
-                    account_id: accountId,
-                },
-                cliVersion: cliPackageJson.version,
-            });
-            context.eventEmission.emit(CLI_COMMAND_EXECUTED_EVENT_SUBJECT, event);
+export const loginPlugin = ({ context, }) => {
+    const loginFn = async (options) => {
+        const timeoutSeconds = options.timeout
+            ? parseInt(options.timeout, 10)
+            : 300;
+        if (isNaN(timeoutSeconds) || timeoutSeconds <= 0) {
+            throw new Error("Timeout must be a positive number");
         }
+        const resolvedCredentials = await context.resolveCredentials();
+        const pkceCredentials = toPkceCredentials(resolvedCredentials);
+        await login({
+            timeoutMs: timeoutSeconds * 1000,
+            credentials: pkceCredentials,
+        });
+        const user = await getLoggedInUser();
+        console.log(`✅ Successfully logged in as ${user.email}`);
     };
     return {
-        login: loginWithTelemetry,
+        login: loginFn,
         context: {
             meta: {
                 login: {

package/dist/src/utils/cli-generator.d.ts

@@ -1,3 +1,4 @@
 import type { Command } from "commander";
 import type { ZapierSdk } from "@zapier/zapier-sdk";
+export declare function sanitizeCliArguments(args: string[]): string[];
 export declare function generateCliCommands(program: Command, sdk: ZapierSdk): void;

package/dist/src/utils/cli-generator.js

@@ -6,6 +6,41 @@ import chalk from "chalk";
 import inquirer from "inquirer";
 import { ZapierCliError, ZapierCliExitError } from "./errors";
 import { SHARED_COMMAND_CLI_OPTIONS } from "./cli-options";
+import { buildCliCommandExecutedEvent } from "../telemetry/builders";
+const CLI_COMMAND_EXECUTED_EVENT_SUBJECT = "platform.sdk.CliCommandExecutedEvent";
+// Flags whose values may contain secrets and must not appear in telemetry
+const SENSITIVE_FLAGS = [
+    "--credentials",
+    "--credentials-client-secret",
+    "--credentials-client-id",
+    "--credentials-base-url",
+    "--user",
+    "--header",
+    "-H",
+    "-u",
+];
+export function sanitizeCliArguments(args) {
+    const sanitized = [];
+    let skipNext = false;
+    for (const arg of args) {
+        if (skipNext) {
+            skipNext = false;
+            sanitized.push("[REDACTED]");
+            continue;
+        }
+        if (SENSITIVE_FLAGS.some((flag) => arg.startsWith(flag + "="))) {
+            sanitized.push(arg.split("=")[0] + "=[REDACTED]");
+        }
+        else if (SENSITIVE_FLAGS.includes(arg)) {
+            sanitized.push(arg);
+            skipNext = true;
+        }
+        else {
+            sanitized.push(arg);
+        }
+    }
+    return sanitized;
+}
 const CONFIRM_MESSAGES = {
     "create-secret": {
         messageBefore: "You are about to create a sensitive secret that will be displayed as plain text.\n" +
@@ -299,6 +334,10 @@ function createCommandConfig(cliCommandName, functionInfo, sdk) {
         schema?.description ||
         `${cliCommandName} command`;
     const handler = async (...args) => {
+        const startTime = Date.now();
+        let success = true;
+        let errorMessage = null;
+        let resolvedParams = {};
         try {
             // The last argument is always the command object with parsed options
             const commandObj = args[args.length - 1];
@@ -312,7 +351,6 @@ function createCommandConfig(cliCommandName, functionInfo, sdk) {
             const rawParams = convertCliArgsToSdkParams(parameters, args.slice(0, -1), options);
             // Resolve missing parameters interactively using schema metadata
             // (only available for inputSchema-based functions)
-            let resolvedParams;
             if (schema && !usesInputParameters) {
                 const resolver = new SchemaParameterResolver();
                 resolvedParams = (await resolver.resolveParameters(schema, rawParams, sdk, functionInfo.name));
@@ -401,6 +439,8 @@ function createCommandConfig(cliCommandName, functionInfo, sdk) {
             }
         }
         catch (error) {
+            success = false;
+            errorMessage = error instanceof Error ? error.message : String(error);
             // Handle Zod validation errors more gracefully
             if (error instanceof Error && error.message.includes('"code"')) {
                 try {
@@ -431,9 +471,34 @@ function createCommandConfig(cliCommandName, functionInfo, sdk) {
             }
             else {
                 // Handle other errors
-                const errorMessage = error instanceof Error ? error.message : "Unknown error";
-                console.error(chalk.red("❌ Error:"), errorMessage);
-                throw new ZapierCliExitError(errorMessage, 1);
+                const msg = error instanceof Error ? error.message : "Unknown error";
+                console.error(chalk.red("❌ Error:"), msg);
+                throw new ZapierCliExitError(msg, 1);
+            }
+        }
+        finally {
+            try {
+                const event = buildCliCommandExecutedEvent({
+                    data: {
+                        cli_primary_command: cliCommandName,
+                        success_flag: success,
+                        execution_duration_ms: Date.now() - startTime,
+                        exit_code: success ? 0 : 1,
+                        error_message: errorMessage,
+                        command_category: functionInfo.categories?.[0] ?? null,
+                        requires_auth: null,
+                        cli_arguments: sanitizeCliArguments(process.argv.slice(2)),
+                    },
+                    context: {
+                        selected_api: resolvedParams.appKey ?? null,
+                    },
+                });
+                sdk
+                    .getContext()
+                    .eventEmission.emit(CLI_COMMAND_EXECUTED_EVENT_SUBJECT, event);
+            }
+            catch {
+                // Never let telemetry failures affect command execution
             }
         }
     };

package/dist/src/utils/parameter-resolver.js

@@ -260,47 +260,49 @@ export class SchemaParameterResolver {
             throw new Error(`No resolver found for parameter: ${param.name}`);
         }
         console.log(chalk.blue(`\n🔍 Resolving ${param.name}...`));
-        const typedResolver = resolver;
-        if (typedResolver.type === "static") {
-            // Static resolver - just prompt for input
+        if (resolver.type === "static") {
+            const staticResolver = resolver;
             const promptConfig = {
-                type: typedResolver.inputType === "password" ? "password" : "input",
+                type: staticResolver.inputType === "password" ? "password" : "input",
                 name: param.name,
                 message: `Enter ${param.name}:`,
-                ...(typedResolver.placeholder && {
-                    default: typedResolver.placeholder,
+                ...(staticResolver.placeholder && {
+                    default: staticResolver.placeholder,
                 }),
             };
             const answers = await inquirer.prompt([promptConfig]);
             return answers[param.name];
         }
-        else if (typedResolver.type === "dynamic") {
-            // Dynamic resolver - fetch options and prompt for selection
-            try {
-                // Only show "Fetching..." for required parameters that typically have many options
-                if (param.isRequired && param.name !== "connectionId") {
-                    console.log(chalk.gray(`Fetching options for ${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 {
+                    // Fall through to fetch/prompt if pre-resolution fails
                 }
-                const items = await typedResolver.fetch(context.sdk, context.resolvedParams);
-                // Let the resolver's prompt handle empty lists (e.g., connectionId can show "skip connection")
-                const safeItems = items || [];
-                const promptConfig = typedResolver.prompt(safeItems, context.resolvedParams);
-                const answers = await inquirer.prompt([promptConfig]);
-                return answers[param.name];
             }
-            catch (error) {
-                // Let the main CLI error handler display user-friendly errors
-                throw error;
+            // Only show "Fetching..." for required parameters that typically have many options
+            if (param.isRequired && param.name !== "connectionId") {
+                console.log(chalk.gray(`Fetching options for ${param.name}...`));
             }
+            const items = await dynamicResolver.fetch(context.sdk, context.resolvedParams);
+            // Let the resolver's prompt handle empty lists (e.g., connectionId can show "skip connection")
+            const safeItems = items || [];
+            const promptConfig = dynamicResolver.prompt(safeItems, context.resolvedParams);
+            const answers = await inquirer.prompt([promptConfig]);
+            return answers[param.name];
         }
-        else if (typedResolver.type === "fields") {
-            // Fields resolver - fetch field definitions and prompt for each input with recursive field resolution
+        else if (resolver.type === "fields") {
             return await this.resolveFieldsRecursively(resolver, context, param);
         }
         throw new Error(`Unknown resolver type for ${param.name}`);
     }
     async resolveFieldsRecursively(resolver, context, param) {
-        const typedResolver = resolver;
         const inputs = {};
         let processedFieldKeys = new Set();
         let iteration = 0;
@@ -316,7 +318,7 @@ export class SchemaParameterResolver {
                 },
             };
             console.log(chalk.gray(`Fetching input fields for ${param.name}${iteration > 1 ? ` (iteration ${iteration})` : ""}...`));
-            const rootFieldItems = await typedResolver.fetch(updatedContext.sdk, updatedContext.resolvedParams);
+            const rootFieldItems = await resolver.fetch(updatedContext.sdk, updatedContext.resolvedParams);
             if (!rootFieldItems || rootFieldItems.length === 0) {
                 if (iteration === 1) {
                     console.log(chalk.yellow(`No input fields required for this action.`));