@zapier/zapier-sdk-cli 0.55.2 → 0.55.4

package/dist/index.mjs

@@ -7,7 +7,7 @@ import crypto, { createHash } from 'crypto';
 import * as path from 'path';
 import { resolve, join, dirname, basename, relative, extname } from 'path';
 import * as lockfile from 'proper-lockfile';
-import { definePlugin, createPluginMethod, OutputPropertySchema, ZapierBundleError, DEFAULT_CONFIG_PATH, ZapierValidationError, ZapierUnknownError, ZapierReleaseTriggerMessageSignal, injectCliLogin, getOrCreateApiClient, isPermanentHttpError, invalidateCachedToken, batch, toSnakeCase, ZapierAbortDrainSignal, isCredentialsObject, buildApplicationLifecycleEvent, ZapierAuthenticationError, ZapierError, createZapierSdkStack, addPlugin, getOsInfo, getPlatformVersions, getCiPlatform, isCi, getReleaseId, getCurrentTimestamp, generateEventId } from '@zapier/zapier-sdk';
+import { definePlugin, createPluginMethod, OutputPropertySchema, ZapierBundleError, DEFAULT_CONFIG_PATH, ZapierValidationError, ZapierUnknownError, ZapierReleaseTriggerMessageSignal, injectCliLogin, getOrCreateApiClient, isPermanentHttpError, invalidateCachedToken, batch, toSnakeCase, ZapierAbortDrainSignal, isCredentialsObject, buildApplicationLifecycleEvent, ZapierAuthenticationError, ZapierError, createZapierSdkStack, addPlugin, getOsInfo, getPlatformVersions, getAgent, getTtyContext, getCiPlatform, isCi, getReleaseId, getCurrentTimestamp, generateEventId } from '@zapier/zapier-sdk';
 import { z } from 'zod';
 import { hostname } from 'os';
 import inquirer from 'inquirer';
@@ -289,6 +289,34 @@ function createCache() {
     }
   };
 }
+var ZapierCliError = class extends ZapierError {
+};
+var ZapierCliUserCancellationError = class extends ZapierCliError {
+  constructor(message = "Operation cancelled by user") {
+    super(message);
+    this.name = "ZapierCliUserCancellationError";
+    this.code = "ZAPIER_CLI_USER_CANCELLATION";
+    this.exitCode = 0;
+  }
+};
+var ZapierCliExitError = class extends ZapierCliError {
+  constructor(message, exitCode = 1) {
+    super(message);
+    this.name = "ZapierCliExitError";
+    this.code = "ZAPIER_CLI_EXIT";
+    this.exitCode = exitCode;
+  }
+};
+var ZapierCliValidationError = class extends ZapierCliError {
+  constructor(message) {
+    super(message);
+    this.name = "ZapierCliValidationError";
+    this.code = "ZAPIER_CLI_VALIDATION_ERROR";
+    this.exitCode = 1;
+  }
+};
+
+// src/login/credentials-store.ts
 var SERVICE3 = "zapier-sdk-cli";
 var CREDENTIALS_KEY = "credentials";
 var REGISTRY_KEY = "credentialsRegistry";
@@ -325,6 +353,30 @@ function getActiveCredentials(options) {
   if (!name) return void 0;
   return findEntry(readRegistry(), name, normalizeBaseUrl(options?.baseUrl));
 }
+var MAX_CREDENTIAL_NAME_ATTEMPTS = 500;
+function firstAvailableCredentialName({
+  baseName,
+  taken
+}) {
+  if (!taken.has(baseName)) return baseName;
+  for (let i = 1; i <= MAX_CREDENTIAL_NAME_ATTEMPTS; i++) {
+    const candidate = `${baseName}-${i}`;
+    if (!taken.has(candidate)) return candidate;
+  }
+  throw new ZapierCliValidationError(
+    `Could not find an available credential name for "${baseName}" after ${MAX_CREDENTIAL_NAME_ATTEMPTS} attempts.`
+  );
+}
+function resolveAvailableCredentialName({
+  baseName,
+  baseUrl
+}) {
+  const resolvedBaseUrl = normalizeBaseUrl(baseUrl);
+  const taken = new Set(
+    readRegistry().filter((e) => e.baseUrl === resolvedBaseUrl).map((e) => e.name)
+  );
+  return firstAvailableCredentialName({ baseName, taken });
+}
 async function storeClientCredentials({
   name,
   clientId,
@@ -891,32 +943,6 @@ async function resolveCredentialsBaseUrl(context) {
 function resolveNonInteractive(options) {
   return options.nonInteractive === true || options.skipPrompts === true || !process.stdin.isTTY || !process.stdout.isTTY;
 }
-var ZapierCliError = class extends ZapierError {
-};
-var ZapierCliUserCancellationError = class extends ZapierCliError {
-  constructor(message = "Operation cancelled by user") {
-    super(message);
-    this.name = "ZapierCliUserCancellationError";
-    this.code = "ZAPIER_CLI_USER_CANCELLATION";
-    this.exitCode = 0;
-  }
-};
-var ZapierCliExitError = class extends ZapierCliError {
-  constructor(message, exitCode = 1) {
-    super(message);
-    this.name = "ZapierCliExitError";
-    this.code = "ZAPIER_CLI_EXIT";
-    this.exitCode = exitCode;
-  }
-};
-var ZapierCliValidationError = class extends ZapierCliError {
-  constructor(message) {
-    super(message);
-    this.name = "ZapierCliValidationError";
-    this.code = "ZAPIER_CLI_VALIDATION_ERROR";
-    this.exitCode = 1;
-  }
-};
 
 // src/utils/auth/client-credentials.ts
 var CREDENTIALS_SCOPES = ["external", "credentials"];
@@ -1878,11 +1904,11 @@ async function runAccountAuth({
   console.log(
     "\nGenerating credentials so this machine can make authenticated requests on your behalf."
   );
-  const resolveCredentialsName = interactive ? ({ email }) => promptCredentialsName({
-    email,
+  const baseName = interactive ? await promptCredentialsName({
+    email: profile.email,
     promptMessage: getCredentialsPromptMessage(entryPoint)
-  }) : resolveDefaultCredentialsName;
-  const credentialName = await resolveCredentialsName({ email: profile.email });
+  }) : resolveDefaultCredentialsName({ email: profile.email });
+  const credentialName = interactive ? baseName : resolveAvailableCredentialName({ baseName, baseUrl: credentialsBaseUrl });
   const useApprovals = options.useApprovals === true;
   await saveClientCredentials({
     api: scopedApi,
@@ -4488,7 +4514,7 @@ definePlugin(
 // package.json with { type: 'json' }
 var package_default = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.55.2"};
+  version: "0.55.4"};
 
 // src/sdk.ts
 injectCliLogin(login_exports);
@@ -4516,7 +4542,7 @@ function createZapierCliSdk(options = {}) {
 
 // package.json
 var package_default2 = {
-  version: "0.55.2"};
+  version: "0.55.4"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {
@@ -4560,6 +4586,8 @@ function buildCliCommandExecutedEvent({
     requires_auth: data.requires_auth ?? null,
     is_ci_environment: isCi(),
     ci_platform: getCiPlatform(),
+    ...getTtyContext(),
+    agent: getAgent(),
     package_manager: data.package_manager ?? "pnpm",
     // Default based on project setup
     made_network_requests: data.made_network_requests ?? null,

package/dist/login.cjs

@@ -261,6 +261,8 @@ function createCache() {
     }
   };
 }
+
+// src/login/credentials-store.ts
 var SERVICE3 = "zapier-sdk-cli";
 var CREDENTIALS_KEY = "credentials";
 var REGISTRY_KEY = "credentialsRegistry";

package/dist/login.mjs

@@ -236,6 +236,8 @@ function createCache() {
     }
   };
 }
+
+// src/login/credentials-store.ts
 var SERVICE3 = "zapier-sdk-cli";
 var CREDENTIALS_KEY = "credentials";
 var REGISTRY_KEY = "credentialsRegistry";

package/dist/package.json

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

package/dist/src/login/credentials-store.d.ts

@@ -11,6 +11,28 @@ export type CredentialsEntry = z.infer<typeof CredentialsEntrySchema>;
 export declare function getActiveCredentials(options?: {
     baseUrl?: string;
 }): CredentialsEntry | undefined;
+/**
+ * Pick the first credential name not already present in `taken`. Returns
+ * `baseName` if it is free, otherwise appends an incrementing `-1`, `-2`, …
+ * suffix to the literal base — a base ending in a digit is left intact, so
+ * `acme-1` collides into `acme-1-1`. Storing a credential under a name that
+ * already exists locally silently replaces that entry (and deletes its
+ * keychain secret), so non-interactive login uses this to avoid clobbering a
+ * dormant credential of the same name.
+ */
+export declare function firstAvailableCredentialName({ baseName, taken, }: {
+    baseName: string;
+    taken: ReadonlySet<string>;
+}): string;
+/**
+ * Resolve a locally-unique credential name for the given baseUrl. Local
+ * credentials are keyed by (name, baseUrl), so name collisions — and the
+ * suffixing that avoids them — are scoped per baseUrl.
+ */
+export declare function resolveAvailableCredentialName({ baseName, baseUrl, }: {
+    baseName: string;
+    baseUrl?: string;
+}): string;
 export declare function storeClientCredentials({ name, clientId, clientSecret, scopes, baseUrl, }: {
     name: string;
     clientId: string;

package/dist/src/login/credentials-store.js

@@ -3,6 +3,7 @@ import { getPassword, setPassword, deletePassword } from "cross-keychain";
 import { z } from "zod";
 import { DEFAULT_AUTH_BASE_URL, getConfig } from "./config";
 import { enqueue, getBackendInfo } from "./keychain";
+import { ZapierCliValidationError } from "../utils/errors";
 const SERVICE = "zapier-sdk-cli";
 const CREDENTIALS_KEY = "credentials";
 const REGISTRY_KEY = "credentialsRegistry";
@@ -41,6 +42,38 @@ export function getActiveCredentials(options) {
         return undefined;
     return findEntry(readRegistry(), name, normalizeBaseUrl(options?.baseUrl));
 }
+const MAX_CREDENTIAL_NAME_ATTEMPTS = 500;
+/**
+ * Pick the first credential name not already present in `taken`. Returns
+ * `baseName` if it is free, otherwise appends an incrementing `-1`, `-2`, …
+ * suffix to the literal base — a base ending in a digit is left intact, so
+ * `acme-1` collides into `acme-1-1`. Storing a credential under a name that
+ * already exists locally silently replaces that entry (and deletes its
+ * keychain secret), so non-interactive login uses this to avoid clobbering a
+ * dormant credential of the same name.
+ */
+export function firstAvailableCredentialName({ baseName, taken, }) {
+    if (!taken.has(baseName))
+        return baseName;
+    for (let i = 1; i <= MAX_CREDENTIAL_NAME_ATTEMPTS; i++) {
+        const candidate = `${baseName}-${i}`;
+        if (!taken.has(candidate))
+            return candidate;
+    }
+    throw new ZapierCliValidationError(`Could not find an available credential name for "${baseName}" after ${MAX_CREDENTIAL_NAME_ATTEMPTS} attempts.`);
+}
+/**
+ * Resolve a locally-unique credential name for the given baseUrl. Local
+ * credentials are keyed by (name, baseUrl), so name collisions — and the
+ * suffixing that avoids them — are scoped per baseUrl.
+ */
+export function resolveAvailableCredentialName({ baseName, baseUrl, }) {
+    const resolvedBaseUrl = normalizeBaseUrl(baseUrl);
+    const taken = new Set(readRegistry()
+        .filter((e) => e.baseUrl === resolvedBaseUrl)
+        .map((e) => e.name));
+    return firstAvailableCredentialName({ baseName, taken });
+}
 export async function storeClientCredentials({ name, clientId, clientSecret, scopes, baseUrl, }) {
     if (!name || typeof name !== "string") {
         throw new Error("storeClientCredentials: name is required");

package/dist/src/telemetry/builders.js

@@ -4,7 +4,7 @@
  * Provides builder functions for CLI command telemetry that auto-populate
  * common CLI fields and system information.
  */
-import { generateEventId, getCurrentTimestamp, getReleaseId, getOsInfo, getPlatformVersions, isCi, getCiPlatform, } from "@zapier/zapier-sdk";
+import { generateEventId, getCurrentTimestamp, getReleaseId, getOsInfo, getPlatformVersions, isCi, getCiPlatform, getTtyContext, getAgent, } from "@zapier/zapier-sdk";
 import cliPackageJson from "../../package.json";
 // Create base event for CLI events
 function createCliBaseEvent(context = {}) {
@@ -44,6 +44,8 @@ export function buildCliCommandExecutedEvent({ data, context = {}, cliVersion =
         requires_auth: data.requires_auth ?? null,
         is_ci_environment: isCi(),
         ci_platform: getCiPlatform(),
+        ...getTtyContext(),
+        agent: getAgent(),
         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,

package/dist/src/telemetry/events.d.ts

@@ -34,4 +34,7 @@ export interface CliCommandExecutedEvent extends BaseEvent {
     peak_memory_usage_bytes?: number | null;
     cpu_time_ms?: number | null;
     subprocess_count?: number | null;
+    stdin_is_tty?: boolean | null;
+    stdout_is_tty?: boolean | null;
+    agent?: string | null;
 }

package/dist/src/utils/auth/account-auth.js

@@ -2,7 +2,7 @@ import { hostname } from "node:os";
 import inquirer from "inquirer";
 import { buildApplicationLifecycleEvent, getOrCreateApiClient, isCredentialsObject, } from "@zapier/zapier-sdk";
 import { revokeCredentials } from "../../login/credentials-revoke";
-import { deleteStoredClientCredentials, getActiveCredentials, } from "../../login/credentials-store";
+import { deleteStoredClientCredentials, getActiveCredentials, resolveAvailableCredentialName, } from "../../login/credentials-store";
 import { clearLegacyJwtState, hasLegacyJwtConfig, } from "../../login/legacy-jwt";
 import { resolveCredentialsBaseUrl } from "../../plugins/auth/credentials-base-url";
 import { resolveNonInteractive } from "../non-interactive";
@@ -242,13 +242,18 @@ export async function runAccountAuth({ sdk, options, entryPoint, }) {
     const profile = await getProfile(scopedApi);
     console.log(getProfileMessage(entryPoint, profile.email));
     console.log("\nGenerating credentials so this machine can make authenticated requests on your behalf.");
-    const resolveCredentialsName = interactive
-        ? ({ email }) => promptCredentialsName({
-            email,
+    const baseName = interactive
+        ? await promptCredentialsName({
+            email: profile.email,
             promptMessage: getCredentialsPromptMessage(entryPoint),
         })
-        : resolveDefaultCredentialsName;
-    const credentialName = await resolveCredentialsName({ email: profile.email });
+        : resolveDefaultCredentialsName({ email: profile.email });
+    // Non-interactive login can't prompt for a new name, so a default name that
+    // already exists locally would silently overwrite that credential. Suffix it
+    // instead. Interactive callers chose the name themselves, so leave it as-is.
+    const credentialName = interactive
+        ? baseName
+        : resolveAvailableCredentialName({ baseName, baseUrl: credentialsBaseUrl });
     const useApprovals = options.useApprovals === true;
     await saveClientCredentials({
         api: scopedApi,