@zapier/zapier-sdk-cli 0.55.3 → 0.55.5

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';
@@ -377,6 +377,15 @@ function resolveAvailableCredentialName({
   );
   return firstAvailableCredentialName({ baseName, taken });
 }
+function credentialNameExists({
+  name,
+  baseUrl
+}) {
+  const resolvedBaseUrl = normalizeBaseUrl(baseUrl);
+  return readRegistry().some(
+    (e) => e.name === name && e.baseUrl === resolvedBaseUrl
+  );
+}
 async function storeClientCredentials({
   name,
   clientId,
@@ -1682,6 +1691,21 @@ function resolveDefaultCredentialsName({
 }) {
   return validateCredentialsName(defaultCredentialsName(email));
 }
+async function resolveCredentialName({
+  email,
+  interactive,
+  baseUrl,
+  entryPoint
+}) {
+  if (interactive) {
+    return promptCredentialsName({
+      email,
+      promptMessage: getCredentialsPromptMessage(entryPoint)
+    });
+  }
+  const baseName = resolveDefaultCredentialsName({ email });
+  return resolveAvailableCredentialName({ baseName, baseUrl });
+}
 function toPkceCredentials(credentials) {
   if (credentials && isCredentialsObject(credentials) && !("clientSecret" in credentials)) {
     return {
@@ -1878,6 +1902,17 @@ async function runAccountAuth({
     ...sdk.context,
     resolvedCredentials
   });
+  const providedName = options.name !== void 0 ? validateCredentialsName(options.name) : void 0;
+  if (providedName !== void 0) {
+    const activeCredentials = getActiveCredentials({
+      baseUrl: credentialsBaseUrl
+    });
+    if (activeCredentials?.name !== providedName && credentialNameExists({ name: providedName, baseUrl: credentialsBaseUrl })) {
+      throw new ZapierCliValidationError(
+        `A credential named "${providedName}" already exists. Choose a different --name.`
+      );
+    }
+  }
   if (!await clearExistingAuthState({
     sdk,
     baseUrl: credentialsBaseUrl,
@@ -1904,11 +1939,12 @@ async function runAccountAuth({
   console.log(
     "\nGenerating credentials so this machine can make authenticated requests on your behalf."
   );
-  const baseName = interactive ? await promptCredentialsName({
+  const credentialName = providedName ?? await resolveCredentialName({
     email: profile.email,
-    promptMessage: getCredentialsPromptMessage(entryPoint)
-  }) : resolveDefaultCredentialsName({ email: profile.email });
-  const credentialName = interactive ? baseName : resolveAvailableCredentialName({ baseName, baseUrl: credentialsBaseUrl });
+    interactive,
+    baseUrl: credentialsBaseUrl,
+    entryPoint
+  });
   const useApprovals = options.useApprovals === true;
   await saveClientCredentials({
     api: scopedApi,
@@ -1926,6 +1962,9 @@ async function runAccountAuth({
   emitAccountAuthSuccess({ sdk, profile });
 }
 var LoginSchema = z.object({
+  name: z.string().optional().describe(
+    "Name to identify these credentials (defaults to <email>@<hostname>). Provide this to set a custom name without the interactive prompt."
+  ),
   timeout: z.string().optional().describe("Login timeout in seconds (default: 300)"),
   useApprovals: z.boolean().optional().describe(
     "Require approvals for actions performed with these credentials"
@@ -4514,7 +4553,7 @@ definePlugin(
 // package.json with { type: 'json' }
 var package_default = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.55.3"};
+  version: "0.55.5"};
 
 // src/sdk.ts
 injectCliLogin(login_exports);
@@ -4542,7 +4581,7 @@ function createZapierCliSdk(options = {}) {
 
 // package.json
 var package_default2 = {
-  version: "0.55.3"};
+  version: "0.55.5"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {
@@ -4586,6 +4625,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/package.json

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

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

@@ -33,6 +33,15 @@ export declare function resolveAvailableCredentialName({ baseName, baseUrl, }: {
     baseName: string;
     baseUrl?: string;
 }): string;
+/**
+ * Whether a credential with this exact (name, baseUrl) is already stored
+ * locally. Used to reject an explicitly-supplied login name that would
+ * otherwise silently overwrite a dormant credential of the same name.
+ */
+export declare function credentialNameExists({ name, baseUrl, }: {
+    name: string;
+    baseUrl?: string;
+}): boolean;
 export declare function storeClientCredentials({ name, clientId, clientSecret, scopes, baseUrl, }: {
     name: string;
     clientId: string;

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

@@ -74,6 +74,15 @@ export function resolveAvailableCredentialName({ baseName, baseUrl, }) {
         .map((e) => e.name));
     return firstAvailableCredentialName({ baseName, taken });
 }
+/**
+ * Whether a credential with this exact (name, baseUrl) is already stored
+ * locally. Used to reject an explicitly-supplied login name that would
+ * otherwise silently overwrite a dormant credential of the same name.
+ */
+export function credentialNameExists({ name, baseUrl, }) {
+    const resolvedBaseUrl = normalizeBaseUrl(baseUrl);
+    return readRegistry().some((e) => e.name === name && e.baseUrl === resolvedBaseUrl);
+}
 export async function storeClientCredentials({ name, clientId, clientSecret, scopes, baseUrl, }) {
     if (!name || typeof name !== "string") {
         throw new Error("storeClientCredentials: name is required");

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

@@ -9,6 +9,7 @@ export declare const loginPlugin: (sdk: {
     };
 }) => {
     login: (options?: {
+        name?: string | undefined;
         timeout?: string | undefined;
         useApprovals?: boolean | undefined;
         nonInteractive?: boolean | undefined;

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

@@ -1,5 +1,6 @@
 import { z } from "zod";
 export declare const LoginSchema: z.ZodObject<{
+    name: z.ZodOptional<z.ZodString>;
     timeout: z.ZodOptional<z.ZodString>;
     useApprovals: z.ZodOptional<z.ZodBoolean>;
     nonInteractive: z.ZodOptional<z.ZodBoolean>;

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

@@ -2,6 +2,10 @@ import { z } from "zod";
 // Login schema
 export const LoginSchema = z
     .object({
+    name: z
+        .string()
+        .optional()
+        .describe("Name to identify these credentials (defaults to <email>@<hostname>). Provide this to set a custom name without the interactive prompt."),
     timeout: z
         .string()
         .optional()

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.d.ts

@@ -1,6 +1,7 @@
 import { type ApiClient, type EventEmissionProvides, type ResolvedCredentials } from "@zapier/zapier-sdk";
 export type AccountAuthEntryPoint = "login" | "signup";
 export interface AccountAuthOptions {
+    name?: string;
     timeout?: string;
     useApprovals?: boolean;
     nonInteractive?: boolean;

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, resolveAvailableCredentialName, } from "../../login/credentials-store";
+import { credentialNameExists, 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";
@@ -61,6 +61,19 @@ async function promptCredentialsName({ email, promptMessage, }) {
 function resolveDefaultCredentialsName({ email, }) {
     return validateCredentialsName(defaultCredentialsName(email));
 }
+async function resolveCredentialName({ email, interactive, baseUrl, entryPoint, }) {
+    if (interactive) {
+        return promptCredentialsName({
+            email,
+            promptMessage: getCredentialsPromptMessage(entryPoint),
+        });
+    }
+    // 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.
+    const baseName = resolveDefaultCredentialsName({ email });
+    return resolveAvailableCredentialName({ baseName, baseUrl });
+}
 function toPkceCredentials(credentials) {
     if (credentials &&
         isCredentialsObject(credentials) &&
@@ -218,6 +231,27 @@ export async function runAccountAuth({ sdk, options, entryPoint, }) {
         ...sdk.context,
         resolvedCredentials,
     });
+    // An explicitly-supplied name is validated and collision-checked up front,
+    // before we tear down the existing session or run OAuth. Otherwise a blank or
+    // already-taken name would only surface after revoking the active credential
+    // and completing the browser flow, leaving the user logged out for nothing.
+    // The name is trimmed but otherwise honored as given — never auto-suffixed —
+    // so a collision is rejected rather than silently overwriting an existing
+    // credential.
+    const providedName = options.name !== undefined
+        ? validateCredentialsName(options.name)
+        : undefined;
+    if (providedName !== undefined) {
+        const activeCredentials = getActiveCredentials({
+            baseUrl: credentialsBaseUrl,
+        });
+        // Re-login under the active credential's own name is a rotation, not a
+        // collision — clearExistingAuthState frees it below.
+        if (activeCredentials?.name !== providedName &&
+            credentialNameExists({ name: providedName, baseUrl: credentialsBaseUrl })) {
+            throw new ZapierCliValidationError(`A credential named "${providedName}" already exists. Choose a different --name.`);
+        }
+    }
     if (!(await clearExistingAuthState({
         sdk,
         baseUrl: credentialsBaseUrl,
@@ -242,18 +276,13 @@ 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 baseName = interactive
-        ? await promptCredentialsName({
+    const credentialName = providedName ??
+        (await resolveCredentialName({
             email: profile.email,
-            promptMessage: getCredentialsPromptMessage(entryPoint),
-        })
-        : 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 });
+            interactive,
+            baseUrl: credentialsBaseUrl,
+            entryPoint,
+        }));
     const useApprovals = options.useApprovals === true;
     await saveClientCredentials({
         api: scopedApi,