@zapier/zapier-sdk-cli 0.34.0 → 0.34.3

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @zapier/zapier-sdk-cli
 
+## 0.34.3
+
+### Patch Changes
+
+- Updated dependencies [a6dec83]
+  - @zapier/zapier-sdk@0.32.2
+  - @zapier/zapier-sdk-mcp@0.9.13
+
+## 0.34.2
+
+### Patch Changes
+
+- 2860435: Emit telemetry events for all CLI commands
+
+## 0.34.1
+
+### Patch Changes
+
+- c7be13e: Fix bug where `add` command hangs after completing successfully
+- Updated dependencies [c7be13e]
+  - @zapier/zapier-sdk@0.32.1
+  - @zapier/zapier-sdk-mcp@0.9.12
+
 ## 0.34.0
 
 ### Minor Changes

package/dist/cli.cjs

@@ -909,7 +909,95 @@ var SHARED_COMMAND_CLI_OPTIONS = [
   }
 ];
 
+// package.json
+var package_default = {
+  version: "0.34.3"};
+
+// src/telemetry/builders.ts
+function createCliBaseEvent(context = {}) {
+  return {
+    event_id: zapierSdk.generateEventId(),
+    timestamp_ms: zapierSdk.getCurrentTimestamp(),
+    release_id: zapierSdk.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 = zapierSdk.getOsInfo();
+  const platformVersions = zapierSdk.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: zapierSdk.isCi(),
+    ci_platform: zapierSdk.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-generator.ts
+var CLI_COMMAND_EXECUTED_EVENT_SUBJECT = "platform.sdk.CliCommandExecutedEvent";
+var SENSITIVE_FLAGS = [
+  "--credentials",
+  "--credentials-client-secret",
+  "--credentials-client-id",
+  "--credentials-base-url",
+  "--user",
+  "--header",
+  "-H",
+  "-u"
+];
+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;
+}
 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.",
@@ -1164,6 +1252,10 @@ function createCommandConfig(cliCommandName, functionInfo, sdk2) {
   const parameters = usesInputParameters ? analyzeInputParameters(functionInfo.inputParameters, functionInfo) : analyzeZodSchema(schema, functionInfo);
   const description = functionInfo.description || schema?.description || `${cliCommandName} command`;
   const handler = async (...args) => {
+    const startTime = Date.now();
+    let success = true;
+    let errorMessage = null;
+    let resolvedParams = {};
     try {
       const commandObj = args[args.length - 1];
       const options = commandObj.opts();
@@ -1178,7 +1270,6 @@ function createCommandConfig(cliCommandName, functionInfo, sdk2) {
         args.slice(0, -1),
         options
       );
-      let resolvedParams;
       if (schema && !usesInputParameters) {
         const resolver = new SchemaParameterResolver();
         resolvedParams = await resolver.resolveParameters(
@@ -1268,6 +1359,8 @@ ${confirmMessageAfter}`));
         }
       }
     } 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);
@@ -1302,9 +1395,29 @@ ${confirmMessageAfter}`));
         console.error(chalk6__default.default.red("\u274C Error:"), formattedMessage);
         throw new ZapierCliExitError(formattedMessage, 1);
       } else {
-        const errorMessage = error instanceof Error ? error.message : "Unknown error";
-        console.error(chalk6__default.default.red("\u274C Error:"), errorMessage);
-        throw new ZapierCliExitError(errorMessage, 1);
+        const msg = error instanceof Error ? error.message : "Unknown error";
+        console.error(chalk6__default.default.red("\u274C 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
+          }
+        });
+        sdk2.getContext().eventEmission.emit(CLI_COMMAND_EXECUTED_EVENT_SUBJECT, event);
+      } catch {
       }
     }
   };
@@ -1863,65 +1976,7 @@ var LoginSchema = zod.z.object({
   timeout: zod.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.0"};
-
-// src/telemetry/builders.ts
-function createCliBaseEvent(context = {}) {
-  return {
-    event_id: zapierSdk.generateEventId(),
-    timestamp_ms: zapierSdk.getCurrentTimestamp(),
-    release_id: zapierSdk.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 = zapierSdk.getOsInfo();
-  const platformVersions = zapierSdk.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: zapierSdk.isCi(),
-    ci_platform: zapierSdk.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(credentials2) {
   if (credentials2 && zapierSdk.isCredentialsObject(credentials2) && !("clientSecret" in credentials2)) {
     return {
@@ -1933,63 +1988,25 @@ function toPkceCredentials(credentials2) {
   }
   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 cliLogin.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 cliLogin.getLoggedInUser();
+    console.log(`\u2705 Successfully logged in as ${user.email}`);
   };
   return {
-    login: loginWithTelemetry,
+    login: loginFn,
     context: {
       meta: {
         login: {
@@ -4143,7 +4160,7 @@ function createZapierCliSdk(options = {}) {
 // package.json with { type: 'json' }
 var package_default2 = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.34.0"};
+  version: "0.34.3"};
 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;
@@ -4290,6 +4307,7 @@ async function checkAndNotifyUpdates({
 }
 
 // src/cli.ts
+var EXIT_GRACE_PERIOD_MS = 500;
 var program = new commander.Command();
 var versionOption = getReservedCliOption("version" /* Version */);
 var helpOption = getReservedCliOption("help" /* Help */);
@@ -4380,5 +4398,11 @@ program.exitOverride();
     }
   }
   await versionCheckPromise;
+  await sdk.getContext().eventEmission.close(exitCode);
+  const exitTimeout = setTimeout(
+    () => process.exit(exitCode),
+    EXIT_GRACE_PERIOD_MS
+  );
+  exitTimeout.unref();
   process.exitCode = exitCode;
 })();

package/dist/cli.mjs

@@ -1,7 +1,7 @@
 #!/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, formatErrorMessage, isCredentialsObject, getOsInfo, getPlatformVersions, getCiPlatform, isCi, isPositional, getReleaseId, getCurrentTimestamp, generateEventId } from '@zapier/zapier-sdk';
+import { createFunction, OutputPropertySchema, DEFAULT_CONFIG_PATH, injectCliLogin, createZapierSdkWithoutRegistry, registryPlugin, ZapierError, ZapierValidationError, ZapierUnknownError, batch, toSnakeCase, formatErrorMessage, isCredentialsObject, isPositional, getOsInfo, getPlatformVersions, getCiPlatform, isCi, getReleaseId, getCurrentTimestamp, generateEventId } from '@zapier/zapier-sdk';
 import inquirer from 'inquirer';
 import chalk6 from 'chalk';
 import util from 'util';
@@ -872,7 +872,95 @@ var SHARED_COMMAND_CLI_OPTIONS = [
   }
 ];
 
+// package.json
+var package_default = {
+  version: "0.34.3"};
+
+// 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
+  };
+}
+
 // src/utils/cli-generator.ts
+var CLI_COMMAND_EXECUTED_EVENT_SUBJECT = "platform.sdk.CliCommandExecutedEvent";
+var SENSITIVE_FLAGS = [
+  "--credentials",
+  "--credentials-client-secret",
+  "--credentials-client-id",
+  "--credentials-base-url",
+  "--user",
+  "--header",
+  "-H",
+  "-u"
+];
+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;
+}
 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.",
@@ -1127,6 +1215,10 @@ function createCommandConfig(cliCommandName, functionInfo, sdk2) {
   const parameters = usesInputParameters ? analyzeInputParameters(functionInfo.inputParameters, functionInfo) : analyzeZodSchema(schema, functionInfo);
   const description = functionInfo.description || schema?.description || `${cliCommandName} command`;
   const handler = async (...args) => {
+    const startTime = Date.now();
+    let success = true;
+    let errorMessage = null;
+    let resolvedParams = {};
     try {
       const commandObj = args[args.length - 1];
       const options = commandObj.opts();
@@ -1141,7 +1233,6 @@ function createCommandConfig(cliCommandName, functionInfo, sdk2) {
         args.slice(0, -1),
         options
       );
-      let resolvedParams;
       if (schema && !usesInputParameters) {
         const resolver = new SchemaParameterResolver();
         resolvedParams = await resolver.resolveParameters(
@@ -1231,6 +1322,8 @@ ${confirmMessageAfter}`));
         }
       }
     } 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);
@@ -1265,9 +1358,29 @@ ${confirmMessageAfter}`));
         console.error(chalk6.red("\u274C Error:"), formattedMessage);
         throw new ZapierCliExitError(formattedMessage, 1);
       } else {
-        const errorMessage = error instanceof Error ? error.message : "Unknown error";
-        console.error(chalk6.red("\u274C Error:"), errorMessage);
-        throw new ZapierCliExitError(errorMessage, 1);
+        const msg = error instanceof Error ? error.message : "Unknown error";
+        console.error(chalk6.red("\u274C 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
+          }
+        });
+        sdk2.getContext().eventEmission.emit(CLI_COMMAND_EXECUTED_EVENT_SUBJECT, event);
+      } catch {
       }
     }
   };
@@ -1826,65 +1939,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.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: 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(credentials2) {
   if (credentials2 && isCredentialsObject(credentials2) && !("clientSecret" in credentials2)) {
     return {
@@ -1896,63 +1951,25 @@ function toPkceCredentials(credentials2) {
   }
   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: {
@@ -4106,7 +4123,7 @@ function createZapierCliSdk(options = {}) {
 // package.json with { type: 'json' }
 var package_default2 = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.34.0"};
+  version: "0.34.3"};
 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;
@@ -4253,6 +4270,7 @@ async function checkAndNotifyUpdates({
 }
 
 // src/cli.ts
+var EXIT_GRACE_PERIOD_MS = 500;
 var program = new Command();
 var versionOption = getReservedCliOption("version" /* Version */);
 var helpOption = getReservedCliOption("help" /* Help */);
@@ -4343,5 +4361,11 @@ program.exitOverride();
     }
   }
   await versionCheckPromise;
+  await sdk.getContext().eventEmission.close(exitCode);
+  const exitTimeout = setTimeout(
+    () => process.exit(exitCode),
+    EXIT_GRACE_PERIOD_MS
+  );
+  exitTimeout.unref();
   process.exitCode = exitCode;
 })();