@zapier/zapier-sdk-cli 0.15.1 → 0.15.3

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @zapier/zapier-sdk-cli
 
+## 0.15.3
+
+### Patch Changes
+
+- f7e552e: Add synchronous customuser_id and account_id retrieval to event emission plugin
+- Updated dependencies [f7e552e]
+  - @zapier/zapier-sdk@0.15.4
+  - @zapier/zapier-sdk-mcp@0.3.28
+
+## 0.15.2
+
+### Patch Changes
+
+- a4aee2e: Enhanced param resolver to fully resolve dynamic input fields and dynamic choices.
+
 ## 0.15.1
 
 ### Patch Changes

package/dist/cli.cjs

@@ -396,7 +396,8 @@ var SchemaParameterResolver = class {
         inputs,
         processedFieldKeys,
         [],
-        iteration
+        iteration,
+        updatedContext
       );
       if (fieldStats.newRequired === 0 && fieldStats.newOptional === 0) {
         break;
@@ -419,7 +420,7 @@ var SchemaParameterResolver = class {
    * Recursively processes fieldsets and their fields, maintaining natural structure
    * and creating nested inputs as needed (e.g., fieldset "foo" becomes inputs.foo = [{}])
    */
-  async processFieldItems(items, targetInputs, processedFieldKeys, fieldsetPath = [], iteration = 1) {
+  async processFieldItems(items, targetInputs, processedFieldKeys, fieldsetPath = [], iteration = 1, context) {
     let newRequiredCount = 0;
     let newOptionalCount = 0;
     let optionalSkipped = false;
@@ -444,7 +445,8 @@ var SchemaParameterResolver = class {
           fieldsetTarget,
           processedFieldKeys,
           nestedPath,
-          iteration
+          iteration,
+          context
         );
         newRequiredCount += nestedStats.newRequired;
         newOptionalCount += nestedStats.newOptional;
@@ -466,7 +468,7 @@ var SchemaParameterResolver = class {
               )
             );
           }
-          await this.promptForField(typedItem, targetInputs);
+          await this.promptForField(typedItem, targetInputs, context);
           processedFieldKeys.add(typedItem.key);
         } else {
           newOptionalCount++;
@@ -499,7 +501,7 @@ There are ${optionalFields.length} ${iteration === 1 ? "" : "additional "}option
             console.log(chalk3__default.default.cyan(`
 Optional fields${pathContext}:`));
             for (const field of optionalFields) {
-              await this.promptForField(field, targetInputs);
+              await this.promptForField(field, targetInputs, context);
               const typedField = field;
               processedFieldKeys.add(typedField.key);
             }
@@ -542,38 +544,171 @@ Optional fields${pathContext}:`));
     }, obj);
     parent[lastKey] = value;
   }
-  async promptForField(field, inputs) {
+  /**
+   * Extract and normalize field metadata from raw field object
+   */
+  extractFieldMetadata(field) {
     const fieldObj = field;
-    const fieldPrompt = {
-      type: fieldObj.type === "boolean" ? "confirm" : "input",
-      name: fieldObj.key,
-      message: `${fieldObj.label || fieldObj.key}${fieldObj.is_required ? " (required)" : " (optional)"}:`
+    const valueType = fieldObj.value_type || "string";
+    return {
+      key: fieldObj.key,
+      title: fieldObj.title || fieldObj.label || fieldObj.key,
+      description: fieldObj.description || fieldObj.helpText,
+      isRequired: fieldObj.is_required || false,
+      defaultValue: fieldObj.default_value ?? fieldObj.default,
+      valueType,
+      hasDropdown: fieldObj.format === "SELECT",
+      isMultiSelect: Boolean(
+        valueType === "array" || fieldObj.items && fieldObj.items.type !== void 0
+      )
     };
-    if (fieldObj.helpText) {
-      fieldPrompt.prefix = chalk3__default.default.gray(`\u2139 ${fieldObj.helpText}
-`);
+  }
+  /**
+   * Fetch a page of choices for a dropdown field
+   */
+  async fetchChoices(fieldMeta, inputs, context, cursor) {
+    try {
+      console.log(
+        chalk3__default.default.gray(
+          cursor ? `  Fetching more choices...` : `  Fetching choices for ${fieldMeta.title}...`
+        )
+      );
+      const page = await context.sdk.listInputFieldChoices({
+        appKey: context.resolvedParams.appKey,
+        actionKey: context.resolvedParams.actionKey,
+        actionType: context.resolvedParams.actionType,
+        authenticationId: context.resolvedParams.authenticationId,
+        inputFieldKey: fieldMeta.key,
+        inputs,
+        ...cursor && { cursor }
+      });
+      const choices = page.data.map((choice) => ({
+        label: choice.label || choice.key || String(choice.value),
+        value: choice.value ?? choice.key
+      }));
+      if (choices.length === 0 && !cursor) {
+        console.log(
+          chalk3__default.default.yellow(`  No choices available for ${fieldMeta.title}`)
+        );
+      }
+      return {
+        choices,
+        nextCursor: page.nextCursor
+      };
+    } catch (error) {
+      console.warn(
+        chalk3__default.default.yellow(`  \u26A0\uFE0F  Failed to fetch choices for ${fieldMeta.title}:`),
+        error
+      );
+      return { choices: [] };
     }
-    if (fieldObj.default !== void 0) {
-      fieldPrompt.default = fieldObj.default;
-    }
-    if (fieldObj.choices && fieldObj.choices.length > 0) {
-      fieldPrompt.type = "list";
-      fieldPrompt.choices = fieldObj.choices.map(
-        (choice) => {
-          const choiceObj = choice;
-          return {
-            name: choiceObj.label || choiceObj.value,
-            value: choiceObj.value
-          };
+  }
+  /**
+   * Prompt user with choices (handles both single and multi-select with pagination)
+   */
+  async promptWithChoices({
+    fieldMeta,
+    choices: initialChoices,
+    nextCursor: initialCursor,
+    inputs,
+    context
+  }) {
+    const choices = [...initialChoices];
+    let nextCursor = initialCursor;
+    const LOAD_MORE_SENTINEL = Symbol("LOAD_MORE");
+    while (true) {
+      const promptChoices = choices.map((choice) => ({
+        name: choice.label,
+        value: choice.value
+      }));
+      if (nextCursor) {
+        promptChoices.push({
+          name: chalk3__default.default.dim("(Load more...)"),
+          value: LOAD_MORE_SENTINEL
+        });
+      }
+      if (!fieldMeta.isRequired && !fieldMeta.isMultiSelect) {
+        promptChoices.push({ name: "(Skip)", value: void 0 });
+      }
+      const promptConfig = {
+        type: fieldMeta.isMultiSelect ? "checkbox" : "list",
+        name: fieldMeta.key,
+        message: `${fieldMeta.title}${fieldMeta.isRequired ? " (required)" : " (optional)"}:`,
+        choices: promptChoices,
+        ...fieldMeta.isMultiSelect && {
+          validate: (input) => {
+            if (fieldMeta.isRequired && (!input || input.length === 0)) {
+              return "At least one selection is required";
+            }
+            return true;
+          }
         }
-      );
+      };
+      const answer = await inquirer__default.default.prompt([promptConfig]);
+      let selectedValue = answer[fieldMeta.key];
+      const wantsMore = fieldMeta.isMultiSelect ? Array.isArray(selectedValue) && selectedValue.includes(LOAD_MORE_SENTINEL) : selectedValue === LOAD_MORE_SENTINEL;
+      if (wantsMore && nextCursor && context) {
+        if (fieldMeta.isMultiSelect && Array.isArray(selectedValue)) {
+          selectedValue = selectedValue.filter((v) => v !== LOAD_MORE_SENTINEL);
+        }
+        const result = await this.fetchChoices(
+          fieldMeta,
+          inputs,
+          context,
+          nextCursor
+        );
+        choices.push(...result.choices);
+        nextCursor = result.nextCursor;
+        continue;
+      }
+      return selectedValue;
+    }
+  }
+  /**
+   * Prompt user for free-form input (text or boolean)
+   */
+  async promptFreeForm(fieldMeta) {
+    const promptConfig = {
+      name: fieldMeta.key,
+      message: `${fieldMeta.title}${fieldMeta.isRequired ? " (required)" : " (optional)"}:`
+    };
+    if (fieldMeta.valueType === "boolean") {
+      promptConfig.type = "confirm";
+      promptConfig.default = fieldMeta.defaultValue !== void 0 ? Boolean(fieldMeta.defaultValue) : void 0;
+    } else {
+      promptConfig.type = "input";
+      promptConfig.default = fieldMeta.defaultValue;
+      promptConfig.validate = (input) => {
+        if (fieldMeta.isRequired && !input) {
+          return "This field is required";
+        }
+        return true;
+      };
+    }
+    if (fieldMeta.description) {
+      promptConfig.prefix = chalk3__default.default.gray(`\u2139  ${fieldMeta.description}
+`);
     }
     try {
-      const answer = await inquirer__default.default.prompt([fieldPrompt]);
-      if (answer[fieldObj.key] !== void 0 && answer[fieldObj.key] !== "") {
-        inputs[fieldObj.key] = answer[fieldObj.key];
-      } else if (fieldObj.is_required) {
-        throw new Error(`Required field ${fieldObj.key} cannot be empty`);
+      const answer = await inquirer__default.default.prompt([promptConfig]);
+      return answer[fieldMeta.key];
+    } catch (error) {
+      if (this.isUserCancellation(error)) {
+        console.log(chalk3__default.default.yellow("\n\nOperation cancelled by user"));
+        throw new ZapierCliUserCancellationError();
+      }
+      throw error;
+    }
+  }
+  /**
+   * Store field value in inputs object with validation
+   */
+  storeFieldValue(inputs, key, value, isRequired) {
+    try {
+      if (value !== void 0 && value !== "") {
+        inputs[key] = value;
+      } else if (isRequired) {
+        throw new Error(`Required field ${key} cannot be empty`);
       }
     } catch (error) {
       if (this.isUserCancellation(error)) {
@@ -583,6 +718,34 @@ Optional fields${pathContext}:`));
       throw error;
     }
   }
+  async promptForField(field, inputs, context) {
+    const fieldMeta = this.extractFieldMetadata(field);
+    let choices = [];
+    let nextCursor;
+    if (fieldMeta.hasDropdown && context) {
+      const result = await this.fetchChoices(fieldMeta, inputs, context);
+      choices = result.choices;
+      nextCursor = result.nextCursor;
+    }
+    let selectedValue;
+    if (choices.length > 0) {
+      selectedValue = await this.promptWithChoices({
+        fieldMeta,
+        choices,
+        nextCursor,
+        inputs,
+        context
+      });
+    } else {
+      selectedValue = await this.promptFreeForm(fieldMeta);
+    }
+    this.storeFieldValue(
+      inputs,
+      fieldMeta.key,
+      selectedValue,
+      fieldMeta.isRequired
+    );
+  }
   isUserCancellation(error) {
     const errorObj = error;
     return errorObj?.name === "ExitPromptError" || errorObj?.message?.includes("User force closed") || errorObj?.isTTYError === true;
@@ -1462,7 +1625,7 @@ var LoginSchema = zod.z.object({
 
 // package.json
 var package_default = {
-  version: "0.15.1"};
+  version: "0.15.3"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {
@@ -1541,6 +1704,8 @@ var loginPlugin = ({ context }) => {
     const startTime = Date.now();
     let success = false;
     let errorMessage = null;
+    let accountId = null;
+    let customUserId = null;
     try {
       await loginWithSdk({
         ...options,
@@ -1549,6 +1714,10 @@ var loginPlugin = ({ context }) => {
         authClientId: context.options?.authClientId
       });
       success = true;
+      try {
+        ({ accountId, customUserId } = await zapierSdkCliLogin.getLoggedInUser());
+      } catch {
+      }
     } catch (error) {
       success = false;
       errorMessage = error instanceof Error ? error.message : "Login failed";
@@ -1572,7 +1741,9 @@ var loginPlugin = ({ context }) => {
           session_id: context.session_id,
           selected_api: context.selected_api,
           app_id: context.app_id,
-          app_version_id: context.app_version_id
+          app_version_id: context.app_version_id,
+          customuser_id: customUserId,
+          account_id: accountId
         },
         cliVersion: package_default.version
       });
@@ -2734,7 +2905,7 @@ function createZapierCliSdk(options = {}) {
 // package.json with { type: 'json' }
 var package_default2 = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.15.1"};
+  version: "0.15.3"};
 function detectPackageManager(cwd = process.cwd()) {
   const ua = process.env.npm_config_user_agent;
   if (ua) {

package/dist/cli.mjs

@@ -360,7 +360,8 @@ var SchemaParameterResolver = class {
         inputs,
         processedFieldKeys,
         [],
-        iteration
+        iteration,
+        updatedContext
       );
       if (fieldStats.newRequired === 0 && fieldStats.newOptional === 0) {
         break;
@@ -383,7 +384,7 @@ var SchemaParameterResolver = class {
    * Recursively processes fieldsets and their fields, maintaining natural structure
    * and creating nested inputs as needed (e.g., fieldset "foo" becomes inputs.foo = [{}])
    */
-  async processFieldItems(items, targetInputs, processedFieldKeys, fieldsetPath = [], iteration = 1) {
+  async processFieldItems(items, targetInputs, processedFieldKeys, fieldsetPath = [], iteration = 1, context) {
     let newRequiredCount = 0;
     let newOptionalCount = 0;
     let optionalSkipped = false;
@@ -408,7 +409,8 @@ var SchemaParameterResolver = class {
           fieldsetTarget,
           processedFieldKeys,
           nestedPath,
-          iteration
+          iteration,
+          context
         );
         newRequiredCount += nestedStats.newRequired;
         newOptionalCount += nestedStats.newOptional;
@@ -430,7 +432,7 @@ var SchemaParameterResolver = class {
               )
             );
           }
-          await this.promptForField(typedItem, targetInputs);
+          await this.promptForField(typedItem, targetInputs, context);
           processedFieldKeys.add(typedItem.key);
         } else {
           newOptionalCount++;
@@ -463,7 +465,7 @@ There are ${optionalFields.length} ${iteration === 1 ? "" : "additional "}option
             console.log(chalk3.cyan(`
 Optional fields${pathContext}:`));
             for (const field of optionalFields) {
-              await this.promptForField(field, targetInputs);
+              await this.promptForField(field, targetInputs, context);
               const typedField = field;
               processedFieldKeys.add(typedField.key);
             }
@@ -506,38 +508,171 @@ Optional fields${pathContext}:`));
     }, obj);
     parent[lastKey] = value;
   }
-  async promptForField(field, inputs) {
+  /**
+   * Extract and normalize field metadata from raw field object
+   */
+  extractFieldMetadata(field) {
     const fieldObj = field;
-    const fieldPrompt = {
-      type: fieldObj.type === "boolean" ? "confirm" : "input",
-      name: fieldObj.key,
-      message: `${fieldObj.label || fieldObj.key}${fieldObj.is_required ? " (required)" : " (optional)"}:`
+    const valueType = fieldObj.value_type || "string";
+    return {
+      key: fieldObj.key,
+      title: fieldObj.title || fieldObj.label || fieldObj.key,
+      description: fieldObj.description || fieldObj.helpText,
+      isRequired: fieldObj.is_required || false,
+      defaultValue: fieldObj.default_value ?? fieldObj.default,
+      valueType,
+      hasDropdown: fieldObj.format === "SELECT",
+      isMultiSelect: Boolean(
+        valueType === "array" || fieldObj.items && fieldObj.items.type !== void 0
+      )
     };
-    if (fieldObj.helpText) {
-      fieldPrompt.prefix = chalk3.gray(`\u2139 ${fieldObj.helpText}
-`);
+  }
+  /**
+   * Fetch a page of choices for a dropdown field
+   */
+  async fetchChoices(fieldMeta, inputs, context, cursor) {
+    try {
+      console.log(
+        chalk3.gray(
+          cursor ? `  Fetching more choices...` : `  Fetching choices for ${fieldMeta.title}...`
+        )
+      );
+      const page = await context.sdk.listInputFieldChoices({
+        appKey: context.resolvedParams.appKey,
+        actionKey: context.resolvedParams.actionKey,
+        actionType: context.resolvedParams.actionType,
+        authenticationId: context.resolvedParams.authenticationId,
+        inputFieldKey: fieldMeta.key,
+        inputs,
+        ...cursor && { cursor }
+      });
+      const choices = page.data.map((choice) => ({
+        label: choice.label || choice.key || String(choice.value),
+        value: choice.value ?? choice.key
+      }));
+      if (choices.length === 0 && !cursor) {
+        console.log(
+          chalk3.yellow(`  No choices available for ${fieldMeta.title}`)
+        );
+      }
+      return {
+        choices,
+        nextCursor: page.nextCursor
+      };
+    } catch (error) {
+      console.warn(
+        chalk3.yellow(`  \u26A0\uFE0F  Failed to fetch choices for ${fieldMeta.title}:`),
+        error
+      );
+      return { choices: [] };
     }
-    if (fieldObj.default !== void 0) {
-      fieldPrompt.default = fieldObj.default;
-    }
-    if (fieldObj.choices && fieldObj.choices.length > 0) {
-      fieldPrompt.type = "list";
-      fieldPrompt.choices = fieldObj.choices.map(
-        (choice) => {
-          const choiceObj = choice;
-          return {
-            name: choiceObj.label || choiceObj.value,
-            value: choiceObj.value
-          };
+  }
+  /**
+   * Prompt user with choices (handles both single and multi-select with pagination)
+   */
+  async promptWithChoices({
+    fieldMeta,
+    choices: initialChoices,
+    nextCursor: initialCursor,
+    inputs,
+    context
+  }) {
+    const choices = [...initialChoices];
+    let nextCursor = initialCursor;
+    const LOAD_MORE_SENTINEL = Symbol("LOAD_MORE");
+    while (true) {
+      const promptChoices = choices.map((choice) => ({
+        name: choice.label,
+        value: choice.value
+      }));
+      if (nextCursor) {
+        promptChoices.push({
+          name: chalk3.dim("(Load more...)"),
+          value: LOAD_MORE_SENTINEL
+        });
+      }
+      if (!fieldMeta.isRequired && !fieldMeta.isMultiSelect) {
+        promptChoices.push({ name: "(Skip)", value: void 0 });
+      }
+      const promptConfig = {
+        type: fieldMeta.isMultiSelect ? "checkbox" : "list",
+        name: fieldMeta.key,
+        message: `${fieldMeta.title}${fieldMeta.isRequired ? " (required)" : " (optional)"}:`,
+        choices: promptChoices,
+        ...fieldMeta.isMultiSelect && {
+          validate: (input) => {
+            if (fieldMeta.isRequired && (!input || input.length === 0)) {
+              return "At least one selection is required";
+            }
+            return true;
+          }
         }
-      );
+      };
+      const answer = await inquirer.prompt([promptConfig]);
+      let selectedValue = answer[fieldMeta.key];
+      const wantsMore = fieldMeta.isMultiSelect ? Array.isArray(selectedValue) && selectedValue.includes(LOAD_MORE_SENTINEL) : selectedValue === LOAD_MORE_SENTINEL;
+      if (wantsMore && nextCursor && context) {
+        if (fieldMeta.isMultiSelect && Array.isArray(selectedValue)) {
+          selectedValue = selectedValue.filter((v) => v !== LOAD_MORE_SENTINEL);
+        }
+        const result = await this.fetchChoices(
+          fieldMeta,
+          inputs,
+          context,
+          nextCursor
+        );
+        choices.push(...result.choices);
+        nextCursor = result.nextCursor;
+        continue;
+      }
+      return selectedValue;
+    }
+  }
+  /**
+   * Prompt user for free-form input (text or boolean)
+   */
+  async promptFreeForm(fieldMeta) {
+    const promptConfig = {
+      name: fieldMeta.key,
+      message: `${fieldMeta.title}${fieldMeta.isRequired ? " (required)" : " (optional)"}:`
+    };
+    if (fieldMeta.valueType === "boolean") {
+      promptConfig.type = "confirm";
+      promptConfig.default = fieldMeta.defaultValue !== void 0 ? Boolean(fieldMeta.defaultValue) : void 0;
+    } else {
+      promptConfig.type = "input";
+      promptConfig.default = fieldMeta.defaultValue;
+      promptConfig.validate = (input) => {
+        if (fieldMeta.isRequired && !input) {
+          return "This field is required";
+        }
+        return true;
+      };
+    }
+    if (fieldMeta.description) {
+      promptConfig.prefix = chalk3.gray(`\u2139  ${fieldMeta.description}
+`);
     }
     try {
-      const answer = await inquirer.prompt([fieldPrompt]);
-      if (answer[fieldObj.key] !== void 0 && answer[fieldObj.key] !== "") {
-        inputs[fieldObj.key] = answer[fieldObj.key];
-      } else if (fieldObj.is_required) {
-        throw new Error(`Required field ${fieldObj.key} cannot be empty`);
+      const answer = await inquirer.prompt([promptConfig]);
+      return answer[fieldMeta.key];
+    } catch (error) {
+      if (this.isUserCancellation(error)) {
+        console.log(chalk3.yellow("\n\nOperation cancelled by user"));
+        throw new ZapierCliUserCancellationError();
+      }
+      throw error;
+    }
+  }
+  /**
+   * Store field value in inputs object with validation
+   */
+  storeFieldValue(inputs, key, value, isRequired) {
+    try {
+      if (value !== void 0 && value !== "") {
+        inputs[key] = value;
+      } else if (isRequired) {
+        throw new Error(`Required field ${key} cannot be empty`);
       }
     } catch (error) {
       if (this.isUserCancellation(error)) {
@@ -547,6 +682,34 @@ Optional fields${pathContext}:`));
       throw error;
     }
   }
+  async promptForField(field, inputs, context) {
+    const fieldMeta = this.extractFieldMetadata(field);
+    let choices = [];
+    let nextCursor;
+    if (fieldMeta.hasDropdown && context) {
+      const result = await this.fetchChoices(fieldMeta, inputs, context);
+      choices = result.choices;
+      nextCursor = result.nextCursor;
+    }
+    let selectedValue;
+    if (choices.length > 0) {
+      selectedValue = await this.promptWithChoices({
+        fieldMeta,
+        choices,
+        nextCursor,
+        inputs,
+        context
+      });
+    } else {
+      selectedValue = await this.promptFreeForm(fieldMeta);
+    }
+    this.storeFieldValue(
+      inputs,
+      fieldMeta.key,
+      selectedValue,
+      fieldMeta.isRequired
+    );
+  }
   isUserCancellation(error) {
     const errorObj = error;
     return errorObj?.name === "ExitPromptError" || errorObj?.message?.includes("User force closed") || errorObj?.isTTYError === true;
@@ -1426,7 +1589,7 @@ var LoginSchema = z.object({
 
 // package.json
 var package_default = {
-  version: "0.15.1"};
+  version: "0.15.3"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {
@@ -1505,6 +1668,8 @@ var loginPlugin = ({ context }) => {
     const startTime = Date.now();
     let success = false;
     let errorMessage = null;
+    let accountId = null;
+    let customUserId = null;
     try {
       await loginWithSdk({
         ...options,
@@ -1513,6 +1678,10 @@ var loginPlugin = ({ context }) => {
         authClientId: context.options?.authClientId
       });
       success = true;
+      try {
+        ({ accountId, customUserId } = await getLoggedInUser());
+      } catch {
+      }
     } catch (error) {
       success = false;
       errorMessage = error instanceof Error ? error.message : "Login failed";
@@ -1536,7 +1705,9 @@ var loginPlugin = ({ context }) => {
           session_id: context.session_id,
           selected_api: context.selected_api,
           app_id: context.app_id,
-          app_version_id: context.app_version_id
+          app_version_id: context.app_version_id,
+          customuser_id: customUserId,
+          account_id: accountId
         },
         cliVersion: package_default.version
       });
@@ -2698,7 +2869,7 @@ function createZapierCliSdk(options = {}) {
 // package.json with { type: 'json' }
 var package_default2 = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.15.1"};
+  version: "0.15.3"};
 function detectPackageManager(cwd = process.cwd()) {
   const ua = process.env.npm_config_user_agent;
   if (ua) {