@zapier/zapier-sdk-cli 0.52.4 → 0.52.6

package/dist/cli.mjs

@@ -1530,7 +1530,7 @@ var SHARED_COMMAND_CLI_OPTIONS = [
 
 // package.json
 var package_default = {
-  version: "0.52.4"};
+  version: "0.52.6"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {
@@ -3020,12 +3020,6 @@ async function storeClientCredentials({
     await deleteKeychainSecret(existingEntry);
   }
 }
-function credentialsNameExists({
-  name,
-  baseUrl: baseUrl2
-}) {
-  return !!findEntry(readRegistry(), name, normalizeBaseUrl(baseUrl2));
-}
 async function getStoredClientCredentials(options) {
   const entry = options?.name ? findEntry(readRegistry(), options.name, normalizeBaseUrl(options.baseUrl)) : getActiveCredentials(options);
   if (!entry) return void 0;
@@ -3461,8 +3455,11 @@ function emitAuthLogout(onEvent) {
     timestamp: Date.now()
   });
 }
-function isNotFoundError(err) {
-  return typeof err === "object" && err !== null && "statusCode" in err && err.statusCode === 404;
+function getStatusCode(err) {
+  if (typeof err === "object" && err !== null && "statusCode" in err) {
+    return err.statusCode;
+  }
+  return void 0;
 }
 async function revokeCredentials({
   api: api2,
@@ -3478,7 +3475,14 @@ async function revokeCredentials({
           { authRequired: true, requiredScopes: ["credentials"] }
         );
       } catch (err) {
-        if (isNotFoundError(err)) return;
+        const status = getStatusCode(err);
+        if (status === 404) return;
+        if (status === 401) {
+          console.warn(
+            "Could not revoke credentials on the server (unauthorized). Local state will be cleared, but the credential may still be active. Verify or revoke via `list-client-credentials` or `delete-client-credentials`."
+          );
+          return;
+        }
         throw err;
       }
     }
@@ -3838,14 +3842,24 @@ async function resolveCredentialsBaseUrl(context) {
   const resolvedCredentials = "resolvedCredentials" in context ? context.resolvedCredentials : await context.resolveCredentials?.();
   return getBaseUrlFromResolvedCredentials(resolvedCredentials) ?? getBaseUrlFromOptionsCredentials(context.options?.credentials) ?? context.options?.baseUrl;
 }
+
+// src/utils/non-interactive.ts
+function resolveNonInteractive(options) {
+  return (options.nonInteractive ?? options.skipPrompts) === true || !process.stdin.isTTY || !process.stdout.isTTY;
+}
 var LoginSchema = z.object({
   timeout: z.string().optional().describe("Login timeout in seconds (default: 300)"),
   useApprovals: z.boolean().optional().describe(
     "Require approvals for actions performed with these credentials"
   ),
-  skipPrompts: z.boolean().optional().describe(
+  nonInteractive: z.boolean().optional().describe(
     "Skip interactive prompts. Uses defaults where possible; errors instead of prompting when input is required. Useful in CI, piped output, or environments where TTY detection is unreliable."
-  )
+  ),
+  /** @deprecated Use `nonInteractive` instead. */
+  skipPrompts: z.boolean().optional().meta({
+    deprecated: true,
+    deprecationMessage: "Use --non-interactive instead."
+  })
 }).describe("Log in to Zapier to access your account");
 
 // src/plugins/login/index.ts
@@ -3860,8 +3874,8 @@ function toPkceCredentials(credentials2) {
   }
   return void 0;
 }
-async function confirmRevokeAndRelogin(activeCredentials, skipPrompts) {
-  if (skipPrompts) {
+async function confirmRevokeAndRelogin(activeCredentials, nonInteractive) {
+  if (nonInteractive) {
     throw new ZapierCliValidationError(
       `Already logged in as "${activeCredentials.name}". Run \`logout\` first or use an interactive terminal to re-authenticate.`
     );
@@ -3882,8 +3896,8 @@ Log out and log in again?`,
   }
   return true;
 }
-async function confirmJwtMigration(skipPrompts) {
-  if (skipPrompts) {
+async function confirmJwtMigration(nonInteractive) {
+  if (nonInteractive) {
     throw new ZapierCliValidationError(
       "Legacy JWT login detected. Run `logout` first or use an interactive terminal to migrate to client credentials."
     );
@@ -3902,8 +3916,8 @@ async function confirmJwtMigration(skipPrompts) {
   }
   return true;
 }
-async function confirmLocalLoginReset(skipPrompts) {
-  if (skipPrompts) {
+async function confirmLocalLoginReset(nonInteractive) {
+  if (nonInteractive) {
     throw new ZapierCliValidationError(
       "Login cleanup failed and cannot be reset without confirmation. Re-run with an interactive terminal."
     );
@@ -3929,14 +3943,9 @@ function parseTimeoutSeconds(timeout) {
   }
   return timeoutSeconds;
 }
-async function promptCredentialsName(email, skipPrompts, baseUrl2) {
+async function promptCredentialsName(email, nonInteractive) {
   const fallback = `${email}@${hostname()}`;
-  if (skipPrompts) {
-    if (credentialsNameExists({ name: fallback, baseUrl: baseUrl2 })) {
-      throw new ZapierCliValidationError(
-        `Credentials named "${fallback}" already exist. Run \`logout\` first or use an interactive terminal to choose a different name.`
-      );
-    }
+  if (nonInteractive) {
     return fallback;
   }
   const { credentialName } = await inquirer.prompt([
@@ -3947,9 +3956,6 @@ async function promptCredentialsName(email, skipPrompts, baseUrl2) {
       default: fallback,
       validate: (input) => {
         if (!input.trim()) return "Name cannot be empty";
-        if (credentialsNameExists({ name: input.trim(), baseUrl: baseUrl2 })) {
-          return `Credentials named "${input.trim()}" already exist. Please provide a different name.`;
-        }
         return true;
       }
     }
@@ -3993,7 +3999,7 @@ var loginPlugin = definePlugin(
     supportsJsonOutput: false,
     handler: async ({ sdk: sdk2, options }) => {
       const timeoutSeconds = parseTimeoutSeconds(options.timeout);
-      const skipPrompts = options.skipPrompts === true || !process.stdin.isTTY || !process.stdout.isTTY;
+      const nonInteractive = resolveNonInteractive(options);
       const resolvedCredentials = await sdk2.context.resolveCredentials();
       const pkceCredentials = toPkceCredentials(resolvedCredentials);
       const credentialsBaseUrl2 = await resolveCredentialsBaseUrl({
@@ -4004,7 +4010,7 @@ var loginPlugin = definePlugin(
         baseUrl: credentialsBaseUrl2
       });
       if (activeCredentials) {
-        if (!await confirmRevokeAndRelogin(activeCredentials, skipPrompts))
+        if (!await confirmRevokeAndRelogin(activeCredentials, nonInteractive))
           return;
         try {
           await revokeCredentials({
@@ -4012,14 +4018,14 @@ var loginPlugin = definePlugin(
             credentials: activeCredentials
           });
         } catch {
-          if (!await confirmLocalLoginReset(skipPrompts)) return;
+          if (!await confirmLocalLoginReset(nonInteractive)) return;
           await deleteStoredClientCredentials({
             name: activeCredentials.name,
             baseUrl: activeCredentials.baseUrl
           });
         }
       } else if (hasLegacyJwtConfig()) {
-        if (!await confirmJwtMigration(skipPrompts)) return;
+        if (!await confirmJwtMigration(nonInteractive)) return;
       }
       const { accessToken } = await runOauthFlow({
         timeoutMs: timeoutSeconds * 1e3,
@@ -4037,8 +4043,7 @@ var loginPlugin = definePlugin(
       );
       const credentialName = await promptCredentialsName(
         profile.email,
-        skipPrompts,
-        credentialsBaseUrl2
+        nonInteractive
       );
       const useApprovals = options.useApprovals === true;
       await setupClientCredentials({
@@ -4078,20 +4083,6 @@ var logoutPlugin = definePlugin(
         console.log("\u2705 Successfully logged out");
         return;
       }
-      const { confirmed } = await inquirer.prompt([
-        {
-          type: "confirm",
-          name: "confirmed",
-          message: `Logging out will delete credentials "${activeCredentials.name}".
-This may interrupt other Zapier SDK or CLI sessions using them.
-Do you want to continue?`,
-          default: true
-        }
-      ]);
-      if (!confirmed) {
-        console.log("Logout cancelled.");
-        return;
-      }
       await revokeCredentials({
         api: sdk2.context.api,
         credentials: activeCredentials,
@@ -5651,7 +5642,12 @@ var cliOverridesPlugin = definePlugin(
 var TEMPLATES = ["basic"];
 var InitSchema = z.object({
   projectName: z.string().min(1).describe("Name of the project directory to create"),
-  skipPrompts: z.boolean().optional().describe("Skip all interactive prompts and accept all defaults")
+  nonInteractive: z.boolean().optional().describe("Skip all interactive prompts and accept all defaults"),
+  /** @deprecated Use `nonInteractive` instead. */
+  skipPrompts: z.boolean().optional().meta({
+    deprecated: true,
+    deprecationMessage: "Use --non-interactive instead."
+  })
 }).describe(
   "Create a new Zapier SDK project in a new directory with starter files"
 );
@@ -5746,9 +5742,9 @@ function createExec({ cwd }) {
 async function promptYesNo({
   message,
   defaultValue,
-  skipPrompts
+  nonInteractive
 }) {
-  if (skipPrompts) return defaultValue;
+  if (nonInteractive) return defaultValue;
   const { answer } = await inquirer.prompt([
     { type: "confirm", name: "answer", message, default: defaultValue }
   ]);
@@ -5896,14 +5892,14 @@ async function runStep({
   step,
   stepNumber,
   totalSteps,
-  skipPrompts,
+  nonInteractive,
   displayHooks
 }) {
   if (step.askConfirmation) {
     const should = await promptYesNo({
       message: step.description,
       defaultValue: true,
-      skipPrompts
+      nonInteractive
     });
     if (!should) return false;
   }
@@ -5912,7 +5908,7 @@ async function runStep({
     stepNumber,
     totalSteps,
     command: step.command,
-    skipPrompts
+    nonInteractive
   });
   try {
     await step.run();
@@ -6013,11 +6009,11 @@ function createConsoleDisplayHooks() {
       stepNumber,
       totalSteps,
       command,
-      skipPrompts
+      nonInteractive
     }) => {
       const progressMessage = `${description}...`;
       const stepCounter = chalk.dim(`${stepNumber}/${totalSteps}`);
-      if (skipPrompts) {
+      if (nonInteractive) {
         console.log(
           "\n" + chalk.bold(`\u276F  ${progressMessage}`) + "  " + stepCounter + "\n"
         );
@@ -6093,7 +6089,8 @@ var initPlugin = definePlugin(
     inputSchema: InitSchema,
     supportsJsonOutput: false,
     handler: async ({ options }) => {
-      const { projectName: rawName, skipPrompts = false } = options;
+      const { projectName: rawName } = options;
+      const nonInteractive = resolveNonInteractive(options);
       const cwd = process.cwd();
       const { projectName, projectDir } = validateInitOptions({ rawName, cwd });
       const displayHooks = createConsoleDisplayHooks();
@@ -6119,7 +6116,7 @@ var initPlugin = definePlugin(
             step,
             stepNumber: i + 1,
             totalSteps: steps.length,
-            skipPrompts,
+            nonInteractive,
             displayHooks
           })
         );
@@ -6614,7 +6611,7 @@ var watchTriggerInboxCliPlugin = definePlugin(
 // package.json with { type: 'json' }
 var package_default2 = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.52.4"};
+  version: "0.52.6"};
 
 // src/sdk.ts
 injectCliLogin(login_exports);

package/dist/experimental.cjs

@@ -411,12 +411,6 @@ async function storeClientCredentials({
     await deleteKeychainSecret(existingEntry);
   }
 }
-function credentialsNameExists({
-  name,
-  baseUrl
-}) {
-  return !!findEntry(readRegistry(), name, normalizeBaseUrl(baseUrl));
-}
 async function getStoredClientCredentials(options) {
   const entry = options?.name ? findEntry(readRegistry(), options.name, normalizeBaseUrl(options.baseUrl)) : getActiveCredentials(options);
   if (!entry) return void 0;
@@ -852,8 +846,11 @@ function emitAuthLogout(onEvent) {
     timestamp: Date.now()
   });
 }
-function isNotFoundError(err) {
-  return typeof err === "object" && err !== null && "statusCode" in err && err.statusCode === 404;
+function getStatusCode(err) {
+  if (typeof err === "object" && err !== null && "statusCode" in err) {
+    return err.statusCode;
+  }
+  return void 0;
 }
 async function revokeCredentials({
   api: api2,
@@ -869,7 +866,14 @@ async function revokeCredentials({
           { authRequired: true, requiredScopes: ["credentials"] }
         );
       } catch (err) {
-        if (isNotFoundError(err)) return;
+        const status = getStatusCode(err);
+        if (status === 404) return;
+        if (status === 401) {
+          console.warn(
+            "Could not revoke credentials on the server (unauthorized). Local state will be cleared, but the credential may still be active. Verify or revoke via `list-client-credentials` or `delete-client-credentials`."
+          );
+          return;
+        }
         throw err;
       }
     }
@@ -1257,14 +1261,24 @@ async function resolveCredentialsBaseUrl(context) {
   const resolvedCredentials = "resolvedCredentials" in context ? context.resolvedCredentials : await context.resolveCredentials?.();
   return getBaseUrlFromResolvedCredentials(resolvedCredentials) ?? getBaseUrlFromOptionsCredentials(context.options?.credentials) ?? context.options?.baseUrl;
 }
+
+// src/utils/non-interactive.ts
+function resolveNonInteractive(options) {
+  return (options.nonInteractive ?? options.skipPrompts) === true || !process.stdin.isTTY || !process.stdout.isTTY;
+}
 var LoginSchema = zod.z.object({
   timeout: zod.z.string().optional().describe("Login timeout in seconds (default: 300)"),
   useApprovals: zod.z.boolean().optional().describe(
     "Require approvals for actions performed with these credentials"
   ),
-  skipPrompts: zod.z.boolean().optional().describe(
+  nonInteractive: zod.z.boolean().optional().describe(
     "Skip interactive prompts. Uses defaults where possible; errors instead of prompting when input is required. Useful in CI, piped output, or environments where TTY detection is unreliable."
-  )
+  ),
+  /** @deprecated Use `nonInteractive` instead. */
+  skipPrompts: zod.z.boolean().optional().meta({
+    deprecated: true,
+    deprecationMessage: "Use --non-interactive instead."
+  })
 }).describe("Log in to Zapier to access your account");
 
 // src/plugins/login/index.ts
@@ -1279,8 +1293,8 @@ function toPkceCredentials(credentials) {
   }
   return void 0;
 }
-async function confirmRevokeAndRelogin(activeCredentials, skipPrompts) {
-  if (skipPrompts) {
+async function confirmRevokeAndRelogin(activeCredentials, nonInteractive) {
+  if (nonInteractive) {
     throw new ZapierCliValidationError(
       `Already logged in as "${activeCredentials.name}". Run \`logout\` first or use an interactive terminal to re-authenticate.`
     );
@@ -1301,8 +1315,8 @@ Log out and log in again?`,
   }
   return true;
 }
-async function confirmJwtMigration(skipPrompts) {
-  if (skipPrompts) {
+async function confirmJwtMigration(nonInteractive) {
+  if (nonInteractive) {
     throw new ZapierCliValidationError(
       "Legacy JWT login detected. Run `logout` first or use an interactive terminal to migrate to client credentials."
     );
@@ -1321,8 +1335,8 @@ async function confirmJwtMigration(skipPrompts) {
   }
   return true;
 }
-async function confirmLocalLoginReset(skipPrompts) {
-  if (skipPrompts) {
+async function confirmLocalLoginReset(nonInteractive) {
+  if (nonInteractive) {
     throw new ZapierCliValidationError(
       "Login cleanup failed and cannot be reset without confirmation. Re-run with an interactive terminal."
     );
@@ -1348,14 +1362,9 @@ function parseTimeoutSeconds(timeout) {
   }
   return timeoutSeconds;
 }
-async function promptCredentialsName(email, skipPrompts, baseUrl) {
+async function promptCredentialsName(email, nonInteractive) {
   const fallback = `${email}@${os.hostname()}`;
-  if (skipPrompts) {
-    if (credentialsNameExists({ name: fallback, baseUrl })) {
-      throw new ZapierCliValidationError(
-        `Credentials named "${fallback}" already exist. Run \`logout\` first or use an interactive terminal to choose a different name.`
-      );
-    }
+  if (nonInteractive) {
     return fallback;
   }
   const { credentialName } = await inquirer__default.default.prompt([
@@ -1366,9 +1375,6 @@ async function promptCredentialsName(email, skipPrompts, baseUrl) {
       default: fallback,
       validate: (input) => {
         if (!input.trim()) return "Name cannot be empty";
-        if (credentialsNameExists({ name: input.trim(), baseUrl })) {
-          return `Credentials named "${input.trim()}" already exist. Please provide a different name.`;
-        }
         return true;
       }
     }
@@ -1412,7 +1418,7 @@ var loginPlugin = zapierSdk.definePlugin(
     supportsJsonOutput: false,
     handler: async ({ sdk: sdk2, options }) => {
       const timeoutSeconds = parseTimeoutSeconds(options.timeout);
-      const skipPrompts = options.skipPrompts === true || !process.stdin.isTTY || !process.stdout.isTTY;
+      const nonInteractive = resolveNonInteractive(options);
       const resolvedCredentials = await sdk2.context.resolveCredentials();
       const pkceCredentials = toPkceCredentials(resolvedCredentials);
       const credentialsBaseUrl = await resolveCredentialsBaseUrl({
@@ -1423,7 +1429,7 @@ var loginPlugin = zapierSdk.definePlugin(
         baseUrl: credentialsBaseUrl
       });
       if (activeCredentials) {
-        if (!await confirmRevokeAndRelogin(activeCredentials, skipPrompts))
+        if (!await confirmRevokeAndRelogin(activeCredentials, nonInteractive))
           return;
         try {
           await revokeCredentials({
@@ -1431,14 +1437,14 @@ var loginPlugin = zapierSdk.definePlugin(
             credentials: activeCredentials
           });
         } catch {
-          if (!await confirmLocalLoginReset(skipPrompts)) return;
+          if (!await confirmLocalLoginReset(nonInteractive)) return;
           await deleteStoredClientCredentials({
             name: activeCredentials.name,
             baseUrl: activeCredentials.baseUrl
           });
         }
       } else if (hasLegacyJwtConfig()) {
-        if (!await confirmJwtMigration(skipPrompts)) return;
+        if (!await confirmJwtMigration(nonInteractive)) return;
       }
       const { accessToken } = await runOauthFlow({
         timeoutMs: timeoutSeconds * 1e3,
@@ -1456,8 +1462,7 @@ var loginPlugin = zapierSdk.definePlugin(
       );
       const credentialName = await promptCredentialsName(
         profile.email,
-        skipPrompts,
-        credentialsBaseUrl
+        nonInteractive
       );
       const useApprovals = options.useApprovals === true;
       await setupClientCredentials({
@@ -1497,20 +1502,6 @@ var logoutPlugin = zapierSdk.definePlugin(
         console.log("\u2705 Successfully logged out");
         return;
       }
-      const { confirmed } = await inquirer__default.default.prompt([
-        {
-          type: "confirm",
-          name: "confirmed",
-          message: `Logging out will delete credentials "${activeCredentials.name}".
-This may interrupt other Zapier SDK or CLI sessions using them.
-Do you want to continue?`,
-          default: true
-        }
-      ]);
-      if (!confirmed) {
-        console.log("Logout cancelled.");
-        return;
-      }
       await revokeCredentials({
         api: sdk2.context.api,
         credentials: activeCredentials,
@@ -3070,7 +3061,12 @@ var cliOverridesPlugin = zapierSdk.definePlugin(
 var TEMPLATES = ["basic"];
 var InitSchema = zod.z.object({
   projectName: zod.z.string().min(1).describe("Name of the project directory to create"),
-  skipPrompts: zod.z.boolean().optional().describe("Skip all interactive prompts and accept all defaults")
+  nonInteractive: zod.z.boolean().optional().describe("Skip all interactive prompts and accept all defaults"),
+  /** @deprecated Use `nonInteractive` instead. */
+  skipPrompts: zod.z.boolean().optional().meta({
+    deprecated: true,
+    deprecationMessage: "Use --non-interactive instead."
+  })
 }).describe(
   "Create a new Zapier SDK project in a new directory with starter files"
 );
@@ -3138,9 +3134,9 @@ function createExec({ cwd }) {
 async function promptYesNo({
   message,
   defaultValue,
-  skipPrompts
+  nonInteractive
 }) {
-  if (skipPrompts) return defaultValue;
+  if (nonInteractive) return defaultValue;
   const { answer } = await inquirer__default.default.prompt([
     { type: "confirm", name: "answer", message, default: defaultValue }
   ]);
@@ -3288,14 +3284,14 @@ async function runStep({
   step,
   stepNumber,
   totalSteps,
-  skipPrompts,
+  nonInteractive,
   displayHooks
 }) {
   if (step.askConfirmation) {
     const should = await promptYesNo({
       message: step.description,
       defaultValue: true,
-      skipPrompts
+      nonInteractive
     });
     if (!should) return false;
   }
@@ -3304,7 +3300,7 @@ async function runStep({
     stepNumber,
     totalSteps,
     command: step.command,
-    skipPrompts
+    nonInteractive
   });
   try {
     await step.run();
@@ -3405,11 +3401,11 @@ function createConsoleDisplayHooks() {
       stepNumber,
       totalSteps,
       command,
-      skipPrompts
+      nonInteractive
     }) => {
       const progressMessage = `${description}...`;
       const stepCounter = chalk3__default.default.dim(`${stepNumber}/${totalSteps}`);
-      if (skipPrompts) {
+      if (nonInteractive) {
         console.log(
           "\n" + chalk3__default.default.bold(`\u276F  ${progressMessage}`) + "  " + stepCounter + "\n"
         );
@@ -3485,7 +3481,8 @@ var initPlugin = zapierSdk.definePlugin(
     inputSchema: InitSchema,
     supportsJsonOutput: false,
     handler: async ({ options }) => {
-      const { projectName: rawName, skipPrompts = false } = options;
+      const { projectName: rawName } = options;
+      const nonInteractive = resolveNonInteractive(options);
       const cwd = process.cwd();
       const { projectName, projectDir } = validateInitOptions({ rawName, cwd });
       const displayHooks = createConsoleDisplayHooks();
@@ -3511,7 +3508,7 @@ var initPlugin = zapierSdk.definePlugin(
             step,
             stepNumber: i + 1,
             totalSteps: steps.length,
-            skipPrompts,
+            nonInteractive,
             displayHooks
           })
         );
@@ -4016,7 +4013,7 @@ var watchTriggerInboxCliPlugin = zapierSdk.definePlugin(
 // package.json with { type: 'json' }
 var package_default = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.52.4"};
+  version: "0.52.6"};
 
 // src/experimental.ts
 experimental.injectCliLogin(login_exports);