@payloadcms/figma 0.0.1-alpha.49 → 0.0.1-alpha.50

package/dist/api/control-plane.d.ts

@@ -78,15 +78,6 @@ export interface PerformDeploymentApiResponse {
     };
     status: number;
 }
-/**
- * Response from getDatasetInfo endpoint
- */
-export type DatasetInfo = {
-    cmsId: string;
-    oauthClientId: string;
-    oauthClientSecret: string;
-    tenantId: string;
-};
 /**
  * List all tenant instances for the authenticated user
  * Maps to: GET /v1/tenant
@@ -134,12 +125,30 @@ export declare function createDeployment(accessToken: string, tenantId: string,
  */
 export declare function performDeployment(accessToken: string, tenantId: string, options: PerformDeploymentOptions): Promise<PerformDeploymentResponse>;
 /**
- * Get dataset info including tenant ID and OAuth credentials
- * Maps to: GET /v1/cms/dataset/:datasetId
+ * A single environment returned by the bootstrap endpoint
+ */
+export type BootstrapEnvironment = {
+    contentSystemId: string;
+    name: string;
+    tenantInstanceId: string;
+};
+/**
+ * Response from the bootstrap endpoint (camelCased)
+ */
+export type BootstrapInfo = {
+    environments: BootstrapEnvironment[];
+    oauthCredentials: {
+        oauthClientId: string;
+        oauthClientSecret: string;
+    };
+};
+/**
+ * Get bootstrap info for a CMS resource
+ * Maps to: GET /v1/cms/:cmsResourceId/bootstrap
  *
  * @param accessToken - OAuth access token
- * @param datasetId - Content System ID (dataset ID)
- * @returns Dataset info with tenant ID and OAuth credentials
+ * @param cmsResourceId - CMS Resource ID (project ID)
+ * @param environmentName - Optional environment name filter
  */
-export declare function getDatasetInfo(accessToken: string, datasetId: string): Promise<DatasetInfo>;
+export declare function getBootstrapInfo(accessToken: string, cmsResourceId: string, environmentName?: string): Promise<BootstrapInfo>;
 //# sourceMappingURL=control-plane.d.ts.map

package/dist/api/control-plane.js

@@ -2,12 +2,12 @@
  * Control Plane API Client
  *
  * TODO: Replace with real API calls when Control Plane is available
- */ import { ENV_CONFIG, getEnvironment } from '../constants.js';
+ */ import { getEnvConfig } from '../constants.js';
 import * as log from '../utils/log.js';
 /**
  * Get the Control Plane API base URL based on environment
  */ function getControlPlaneBaseUrl() {
-    return process.env.FIGMA_API_BASE_URL || ENV_CONFIG[getEnvironment()].apiBaseUrl;
+    return process.env.FIGMA_API_BASE_URL || getEnvConfig().apiBaseUrl;
 }
 /**
  * Error thrown when Control Plane API calls fail
@@ -241,17 +241,21 @@ import * as log from '../utils/log.js';
     };
 }
 /**
- * Get dataset info including tenant ID and OAuth credentials
- * Maps to: GET /v1/cms/dataset/:datasetId
+ * Get bootstrap info for a CMS resource
+ * Maps to: GET /v1/cms/:cmsResourceId/bootstrap
  *
  * @param accessToken - OAuth access token
- * @param datasetId - Content System ID (dataset ID)
- * @returns Dataset info with tenant ID and OAuth credentials
- */ export async function getDatasetInfo(accessToken, datasetId) {
-    const url = `${getControlPlaneBaseUrl()}/v1/cms/dataset/${datasetId}`;
-    log.debug(`Calling getDatasetInfo API at ${url}`);
+ * @param cmsResourceId - CMS Resource ID (project ID)
+ * @param environmentName - Optional environment name filter
+ */ export async function getBootstrapInfo(accessToken, cmsResourceId, environmentName) {
+    const baseUrl = getControlPlaneBaseUrl();
+    let url = `${baseUrl}/v1/cms/${cmsResourceId}/bootstrap`;
+    if (environmentName) {
+        url += `?environment_name=${encodeURIComponent(environmentName)}`;
+    }
+    log.debug(`Calling getBootstrapInfo API at ${url}`);
     const response = await controlPlaneFetch({
-        context: 'get dataset info',
+        context: 'get bootstrap info',
         options: {
             headers: {
                 Authorization: `Bearer ${accessToken}`
@@ -260,19 +264,16 @@ import * as log from '../utils/log.js';
         url
     });
     const data = await response.json();
-    const sanitizedData = {
-        ...data,
-        meta: {
-            ...data.meta,
-            oauth_client_secret: '[REDACTED]'
-        }
-    };
-    log.debug(`Dataset API response: ${JSON.stringify(sanitizedData, null, 2)}`);
     return {
-        cmsId: data.meta.cms_resource_id,
-        oauthClientId: data.meta.oauth_client_id,
-        oauthClientSecret: data.meta.oauth_client_secret,
-        tenantId: data.meta.tenant_instance_id
+        environments: data.meta.environments.map((env)=>({
+                name: env.name,
+                contentSystemId: env.content_system_id,
+                tenantInstanceId: env.tenant_instance_id
+            })),
+        oauthCredentials: {
+            oauthClientId: data.meta.oauth_credentials.oauth_client_id,
+            oauthClientSecret: data.meta.oauth_credentials.oauth_client_secret
+        }
     };
 }
 const MAX_RETRIES = 3;

package/dist/api/figma-api.js

@@ -3,7 +3,7 @@
  *
  * Client for Figma REST API (Pixie) endpoints
  * Handles project token generation and other CMS-related API calls
- */ import { ENV_CONFIG, getEnvironment } from '../constants.js';
+ */ import { getEnvConfig } from '../constants.js';
 import * as log from '../utils/log.js';
 /**
  * Error thrown when Figma API calls fail
@@ -84,8 +84,7 @@ import * as log from '../utils/log.js';
             };
         }
         // REAL API IMPLEMENTATION
-        const env = getEnvironment();
-        const baseUrl = process.env.FIGMA_API_BASE_URL || ENV_CONFIG[env].apiBaseUrl;
+        const baseUrl = process.env.FIGMA_API_BASE_URL || getEnvConfig().apiBaseUrl;
         const url = `${baseUrl}/v1/cms/${tenantId}/token/`;
         const response = await fetch(url, {
             headers: {
@@ -199,8 +198,7 @@ import * as log from '../utils/log.js';
  * @returns FigmaUserInfo with user profile data
  * @throws {FigmaApiError} If the API call fails
  */ export async function getUserInfo(accessToken) {
-    const env = getEnvironment();
-    const baseUrl = process.env.FIGMA_API_BASE_URL || ENV_CONFIG[env].apiBaseUrl;
+    const baseUrl = process.env.FIGMA_API_BASE_URL || getEnvConfig().apiBaseUrl;
     const url = `${baseUrl}/v1/me`;
     try {
         const response = await fetch(url, {

package/dist/auth/project-token.js

@@ -5,7 +5,7 @@
  * to the Content API. Project tokens are scoped to a specific tenant/CMS
  * and have a shorter lifespan (15-30 minutes) than OAuth tokens.
  */ import { getProjectToken as fetchProjectToken } from '../api/figma-api.js';
-import { getEnvironment } from '../constants.js';
+import { getInfraEnvironment } from '../constants.js';
 import * as log from '../utils/log.js';
 import { JWTValidationError, validateProjectToken } from './jwt-validator.js';
 import { getValidAccessToken } from './oauth-flow.js';
@@ -94,7 +94,7 @@ import { getValidAccessToken } from './oauth-flow.js';
     } else {
         // REAL: Validate JWT signature against JWKS
         try {
-            validatedClaims = await validateProjectToken(projectToken.token, getEnvironment());
+            validatedClaims = await validateProjectToken(projectToken.token, getInfraEnvironment());
         } catch (validationError) {
             // Handle validation errors
             if (validationError instanceof JWTValidationError) {

package/dist/auth/token-store.d.ts

@@ -1,5 +1,5 @@
 import type { Environment } from '../constants.js';
-import type { FigmaTokens, JWTPayload, ProjectToken, TokenStoreConfig } from './types.js';
+import type { BootstrapData, FigmaTokens, JWTPayload, ProjectToken, TokenStoreConfig } from './types.js';
 /**
  * Get the singleton TokenStore instance for an environment
  * Use this for all production code to ensure a single shared instance per environment
@@ -7,7 +7,7 @@ import type { FigmaTokens, JWTPayload, ProjectToken, TokenStoreConfig } from './
  * @param environment - The environment to get the token store for
  * @returns The singleton TokenStore instance for that environment
  */
-export declare function getTokenStore(environment: Environment): TokenStore;
+export declare function getTokenStore(environment?: Environment): TokenStore;
 /**
  * Secure storage manager for Figma OAuth2 tokens
  *
@@ -118,5 +118,32 @@ export declare class TokenStore {
      * @returns Array of tenant IDs
      */
     getAllProjectTokenTenantIds(): string[];
+    /**
+     * Build the composite key for bootstrap data storage
+     * @param projectId - The CMS resource/project ID
+     * @param environmentName - The environment name (e.g. 'production', 'staging')
+     * @returns Composite key string
+     */
+    private bootstrapKey;
+    /**
+     * Retrieve bootstrap data for a project + environment
+     * @param projectId - The CMS resource/project ID
+     * @param environmentName - The environment name
+     * @returns BootstrapData if stored, null otherwise
+     */
+    getBootstrapData(projectId: string, environmentName: string): BootstrapData | null;
+    /**
+     * Store bootstrap data for a project + environment
+     * @param projectId - The CMS resource/project ID
+     * @param environmentName - The environment name
+     * @param data - The bootstrap data to store
+     */
+    setBootstrapData(projectId: string, environmentName: string, data: BootstrapData): void;
+    /**
+     * Clear bootstrap data for a project + environment
+     * @param projectId - The CMS resource/project ID
+     * @param environmentName - The environment name
+     */
+    clearBootstrapData(projectId: string, environmentName: string): void;
 }
 //# sourceMappingURL=token-store.d.ts.map

package/dist/auth/token-store.js

@@ -1,5 +1,6 @@
 /* eslint-disable perfectionist/sort-classes */ import Conf from 'conf';
 import { TOKEN_EXPIRY_BUFFER_SECONDS } from '../config/oauth.js';
+import { getInfraEnvironment } from '../constants.js';
 import { deriveEncryptionKey } from './crypto-utils.js';
 /**
  * Environment-keyed instances for singleton pattern
@@ -10,7 +11,7 @@ import { deriveEncryptionKey } from './crypto-utils.js';
  *
  * @param environment - The environment to get the token store for
  * @returns The singleton TokenStore instance for that environment
- */ export function getTokenStore(environment) {
+ */ export function getTokenStore(environment = getInfraEnvironment()) {
     if (!instances[environment]) {
         instances[environment] = new TokenStore({
             environment
@@ -206,6 +207,42 @@ import { deriveEncryptionKey } from './crypto-utils.js';
         const projectTokens = this.config.get('projectTokens') || {};
         return Object.keys(projectTokens);
     }
+    /**
+   * Build the composite key for bootstrap data storage
+   * @param projectId - The CMS resource/project ID
+   * @param environmentName - The environment name (e.g. 'production', 'staging')
+   * @returns Composite key string
+   */ bootstrapKey(projectId, environmentName) {
+        return `${projectId}:${environmentName}`;
+    }
+    /**
+   * Retrieve bootstrap data for a project + environment
+   * @param projectId - The CMS resource/project ID
+   * @param environmentName - The environment name
+   * @returns BootstrapData if stored, null otherwise
+   */ getBootstrapData(projectId, environmentName) {
+        const allData = this.config.get('bootstrapData') || {};
+        return allData[this.bootstrapKey(projectId, environmentName)] || null;
+    }
+    /**
+   * Store bootstrap data for a project + environment
+   * @param projectId - The CMS resource/project ID
+   * @param environmentName - The environment name
+   * @param data - The bootstrap data to store
+   */ setBootstrapData(projectId, environmentName, data) {
+        const allData = this.config.get('bootstrapData') || {};
+        allData[this.bootstrapKey(projectId, environmentName)] = data;
+        this.config.set('bootstrapData', allData);
+    }
+    /**
+   * Clear bootstrap data for a project + environment
+   * @param projectId - The CMS resource/project ID
+   * @param environmentName - The environment name
+   */ clearBootstrapData(projectId, environmentName) {
+        const allData = this.config.get('bootstrapData') || {};
+        delete allData[this.bootstrapKey(projectId, environmentName)];
+        this.config.set('bootstrapData', allData);
+    }
 }
 
 //# sourceMappingURL=token-store.js.map

package/dist/auth/types.d.ts

@@ -161,6 +161,16 @@ export type FigmaErrorResponse = ErrorResponsePayloadWithErrMessage | ErrorRespo
  * Re-exported from @figma/rest-api-spec
  */
 export type FigmaUser = User;
+/**
+ * Bootstrap data cached in the local encrypted store
+ * Keyed by projectId:environmentName
+ */
+export type BootstrapData = {
+    contentSystemId: string;
+    oauthClientId: string;
+    oauthClientSecret: string;
+    tenantInstanceId: string;
+};
 /**
  * JWT payload structure from Figma project tokens
  * Extends jose's standard JWTPayload with Figma-specific claims

package/dist/cli.js

@@ -4,11 +4,12 @@ import pc from 'picocolors';
 import { buildLambdaZipCommand } from './commands/build-lambda-zip.js';
 import { debugCommand } from './commands/debug.js';
 import { deployCommand } from './commands/deploy.js';
+import { envCommand } from './commands/env.js';
 import { initCommand } from './commands/init.js';
 import { listTokensCommand } from './commands/list-tokens.js';
 import { loginCommand } from './commands/login.js';
 import { logoutCommand } from './commands/logout.js';
-import { setEnvironment } from './constants.js';
+import { setInfraEnvironment } from './constants.js';
 import { helpMessage } from './utils/messages.js';
 /**
  * Entrypoint for bin/cli.js
@@ -33,6 +34,7 @@ class Main {
             '--force': Boolean,
             '--help': Boolean,
             '--id': String,
+            '--infra-env': String,
             '--name': String,
             '--skip-auth': Boolean,
             '--skip-build': Boolean,
@@ -50,16 +52,16 @@ class Main {
         if (this.args['--debug']) {
             process.env.DEBUG = 'true';
         }
-        // Handle --env flag for environment switching
-        if (this.args['--env']) {
-            const envArg = this.args['--env'].toLowerCase();
-            if (envArg === 'prod' || envArg === 'production') {
-                setEnvironment('production');
-            } else if (envArg === 'staging') {
-                setEnvironment('staging');
+        // Handle --infra-env flag for infrastructure environment switching
+        if (this.args['--infra-env']) {
+            const infraEnvArg = this.args['--infra-env'].toLowerCase();
+            if (infraEnvArg === 'prod' || infraEnvArg === 'production') {
+                setInfraEnvironment('production');
+            } else if (infraEnvArg === 'staging') {
+                setInfraEnvironment('staging');
             } else {
                 // eslint-disable-next-line no-console
-                console.error(`Invalid --env value: ${this.args['--env']}. Use 'prod' or 'staging'.`);
+                console.error(`Invalid --infra-env value: ${this.args['--infra-env']}. Use 'production' or 'staging'.`);
                 process.exit(1);
             }
         }
@@ -100,15 +102,22 @@ class Main {
                     await deployCommand({
                         id: this.args['--id'],
                         debug: this.args['--debug'],
+                        env: this.args['--env'],
                         skipBuild: this.args['--skip-build'],
                         yes: this.args['--yes']
                     });
                     break;
+                case 'env':
+                    await envCommand({
+                        name: this.args._[1]
+                    });
+                    break;
                 case 'init':
                     await initCommand({
                         id: this.args['--id'],
                         name: this.args['--name'],
                         debug: this.args['--debug'],
+                        env: this.args['--env'],
                         force: this.args['--force'],
                         skipAuth: this.args['--skip-auth']
                     });

package/dist/commands/debug.js

@@ -3,7 +3,7 @@ import { createRequire } from 'node:module';
 import os from 'node:os';
 import path from 'node:path';
 import { getTokenStore } from '../auth/token-store.js';
-import { getEnvironment } from '../constants.js';
+import { getInfraEnvironment } from '../constants.js';
 import { getEnvVarSync } from '../utils/env-management.js';
 import { maskToken } from '../utils/token-display.js';
 import { getOwnVersion } from '../utils/version-check.js';
@@ -13,7 +13,7 @@ import { getOwnVersion } from '../utils/version-check.js';
  * Outputs environment, auth, project, and package info for debugging.
  * All data is local — no network calls are made.
  */ export async function debugCommand() {
-    const env = getEnvironment();
+    const env = getInfraEnvironment();
     const tokenStore = getTokenStore(env);
     const cwd = process.cwd();
     const lines = [
@@ -28,7 +28,7 @@ import { getOwnVersion } from '../utils/version-check.js';
     console.log(lines.join('\n'));
 }
 function appendSystemSection(lines, env) {
-    lines.push(`Environment:        ${env}`);
+    lines.push(`Infra Environment:  ${env}`);
     lines.push(`Node:               ${process.version}`);
     lines.push(`OS:                 ${os.platform()} ${os.arch()}`);
     lines.push('');
@@ -53,28 +53,29 @@ function appendAuthSection(lines, tokenStore, cwd) {
     lines.push('');
 }
 function appendProjectSection(lines, tokenStore, cwd) {
-    const contentSystemId = getEnvVarSync(cwd, 'FIGMA_CONTENT_API_CONTENT_SYSTEM_ID');
-    const tenantId = getEnvVarSync(cwd, 'FIGMA_TENANT_ID');
-    const oauthClientId = getEnvVarSync(cwd, 'FIGMA_OAUTH_CLIENT_ID');
+    const projectId = getEnvVarSync(cwd, 'FIGMA_PROJECT_ID');
+    const environmentName = getEnvVarSync(cwd, 'FIGMA_ENVIRONMENT_NAME');
     lines.push('Project:');
-    if (!contentSystemId && !tenantId && !oauthClientId) {
+    if (!projectId) {
         lines.push("  Not initialized (run 'init' first)");
         lines.push('');
         return;
     }
-    if (contentSystemId) {
-        lines.push(`  Content System ID:  ${contentSystemId}`);
-    }
-    if (tenantId) {
-        lines.push(`  Tenant ID:          ${tenantId}`);
-    }
-    if (oauthClientId) {
-        lines.push(`  OAuth Client ID:    ${maskToken(oauthClientId)}`);
-    }
-    if (contentSystemId) {
-        const projectToken = tokenStore.getProjectToken(contentSystemId);
-        if (projectToken) {
-            lines.push(`  Project Token:      ${formatExpiryTime(projectToken.expiresAt)}`);
+    lines.push(`  Project ID:         ${projectId}`);
+    lines.push(`  Environment:        ${environmentName ?? '(not set)'}`);
+    // Show bootstrap data from local store
+    if (projectId && environmentName) {
+        const bootstrapData = tokenStore.getBootstrapData(projectId, environmentName);
+        if (bootstrapData) {
+            lines.push(`  Content System ID:  ${bootstrapData.contentSystemId}`);
+            lines.push(`  Tenant Instance ID: ${bootstrapData.tenantInstanceId}`);
+            lines.push(`  OAuth Client ID:    ${maskToken(bootstrapData.oauthClientId)}`);
+            const projectToken = tokenStore.getProjectToken(bootstrapData.contentSystemId);
+            if (projectToken) {
+                lines.push(`  Project Token:      ${formatExpiryTime(projectToken.expiresAt)}`);
+            }
+        } else {
+            lines.push('  Bootstrap Data:     (not cached)');
         }
     }
     lines.push('');
@@ -87,13 +88,17 @@ async function appendPackagesSection(lines) {
     lines.push(`  payload:            ${payloadVersion}`);
 }
 /**
- * Try env-based tenant ID first, then iterate all stored project tokens.
+ * Try resolving email from bootstrap data, then iterate all stored project tokens.
  */ function getEmailFromClaims(tokenStore, cwd) {
-    const tenantId = getEnvVarSync(cwd, 'FIGMA_TENANT_ID');
-    if (tenantId) {
-        const email = tokenStore.getProjectTokenClaims(tenantId)?.email;
-        if (email) {
-            return email;
+    const projectId = getEnvVarSync(cwd, 'FIGMA_PROJECT_ID');
+    const environmentName = getEnvVarSync(cwd, 'FIGMA_ENVIRONMENT_NAME');
+    if (projectId && environmentName) {
+        const bootstrapData = tokenStore.getBootstrapData(projectId, environmentName);
+        if (bootstrapData) {
+            const email = tokenStore.getProjectTokenClaims(bootstrapData.contentSystemId)?.email;
+            if (email) {
+                return email;
+            }
         }
     }
     for (const id of tokenStore.getAllProjectTokenTenantIds()){

package/dist/commands/deploy.d.ts

@@ -4,7 +4,9 @@
 export interface DeployCommandOptions {
     /** Enable debug mode */
     debug?: boolean;
-    /** Tenant ID */
+    /** Figma environment name (e.g. 'production', 'staging') */
+    env?: string;
+    /** CMS Resource ID (overrides FIGMA_PROJECT_ID) */
     id?: string;
     /** Skip the build step (use existing build) */
     skipBuild?: boolean;

package/dist/commands/deploy.js

@@ -2,16 +2,17 @@ import * as p from '@clack/prompts';
 import spawn from 'cross-spawn';
 import path from 'path';
 import pc from 'picocolors';
-import { ControlPlaneError, createDeployment, getTenantDetails, performDeployment } from '../api/control-plane.js';
+import { ControlPlaneError, createDeployment, getBootstrapInfo, performDeployment } from '../api/control-plane.js';
 import { getValidAccessToken } from '../auth/oauth-flow.js';
 import { getTokenStore } from '../auth/token-store.js';
-import { CONTENT_SYSTEM_NOT_FOUND_MESSAGE, getEnvironment } from '../constants.js';
+import { CONTENT_SYSTEM_NOT_FOUND_MESSAGE } from '../constants.js';
 import { collectStaticAssets, createLambdaZip, getFileSize } from '../utils/asset-collection.js';
 import { detectBuild, getBuildCommand } from '../utils/build-detection.js';
 import { getEnvVar } from '../utils/env-management.js';
 import * as log from '../utils/log.js';
 import { getPackageManager } from '../utils/package-manager.js';
 import { isInProjectDirectory } from '../utils/project.js';
+import { resolveEnvironment } from '../utils/resolve-environment.js';
 import { uploadLambdaZip, uploadStaticAssets } from '../utils/s3-upload.js';
 import { loginCommand } from './login.js';
 /**
@@ -49,14 +50,17 @@ import { loginCommand } from './login.js';
  */ export async function deployCommand(options) {
     const projectPath = process.cwd();
     const spinner = p.spinner();
-    let tenantId = options.id;
-    if (!tenantId) {
-        tenantId = await getEnvVar(projectPath, 'FIGMA_TENANT_ID') ?? undefined;
+    // Resolve project ID
+    let projectId = options.id;
+    if (!projectId) {
+        projectId = await getEnvVar(projectPath, 'FIGMA_PROJECT_ID') ?? undefined;
     }
-    if (!tenantId) {
-        p.log.error(pc.red('✗ Tenant ID not found. Run `@payloadcms/figma init` first.'));
+    if (!projectId) {
+        p.log.error(pc.red('✗ Project ID not found. Run `@payloadcms/figma init` first, or use --id.'));
         process.exit(1);
     }
+    // Resolve environment name
+    const environmentName = options.env ?? await getEnvVar(projectPath, 'FIGMA_ENVIRONMENT_NAME') ?? undefined;
     try {
         // ===== PRE-FLIGHT CHECKS =====
         // Check if in project directory
@@ -66,7 +70,7 @@ import { loginCommand } from './login.js';
             process.exit(1);
         }
         // Check authentication
-        const tokenStore = getTokenStore(getEnvironment());
+        const tokenStore = getTokenStore();
         let accessToken = await getValidAccessToken(tokenStore);
         if (!accessToken) {
             p.log.message('Please log in to continue');
@@ -77,18 +81,26 @@ import { loginCommand } from './login.js';
                 process.exit(1);
             }
         }
-        // ===== PREFLIGHT: Verify content system exists =====
-        spinner.start('Verifying content system...');
+        // Resolve tenant instance ID via bootstrap
+        spinner.start('Resolving deployment target...');
+        let tenantInstanceId;
         try {
-            await getTenantDetails(accessToken, tenantId);
-            spinner.stop(pc.green('✓ Content system verified'));
+            const bootstrapInfo = await getBootstrapInfo(accessToken, projectId);
+            const resolvedEnv = resolveEnvironment({
+                environmentName,
+                environments: bootstrapInfo.environments
+            });
+            tenantInstanceId = resolvedEnv.tenantInstanceId;
+            spinner.stop(pc.green(`✓ Target: ${resolvedEnv.name}`));
         } catch (error) {
             if (error instanceof ControlPlaneError && (error.statusCode === 404 || error.statusCode === 410)) {
                 spinner.stop(pc.red('✗ Content system not found'));
                 p.log.error(pc.red(CONTENT_SYSTEM_NOT_FOUND_MESSAGE));
                 process.exit(1);
             }
-            throw error;
+            spinner.stop(pc.red('✗ Failed to resolve deployment target'));
+            p.log.error(error instanceof Error ? error.message : 'Unknown error');
+            process.exit(1);
         }
         // ===== BUILD =====
         let buildInfo;
@@ -201,7 +213,7 @@ import { loginCommand } from './login.js';
         // ===== DEPLOYMENT EXECUTION =====
         // Step 1: Create deployment
         spinner.start('Creating deployment...');
-        const createResponse = await createDeployment(accessToken, tenantId, {
+        const createResponse = await createDeployment(accessToken, tenantInstanceId, {
             staticAssets
         });
         const deploymentId = createResponse.deploymentId;
@@ -227,7 +239,7 @@ import { loginCommand } from './login.js';
         }
         // Step 4: Perform deployment
         spinner.start('Performing deployment...');
-        const result = await performDeployment(accessToken, tenantId, {
+        const result = await performDeployment(accessToken, tenantInstanceId, {
             deploymentId
         });
         const tenantDomains = result.tenantDomains ?? [];

package/dist/commands/env.d.ts

@@ -0,0 +1,13 @@
+export interface EnvCommandOptions {
+    /** Environment name to switch to (skips interactive prompt) */
+    name?: string;
+}
+/**
+ * Handle the `@payloadcms/figma env [name]` command
+ *
+ * If name is provided, switches directly. Otherwise lists available
+ * environments with an interactive picker.
+ * Updates FIGMA_ENVIRONMENT_NAME in .env and caches all bootstrap data.
+ */
+export declare function envCommand(options: EnvCommandOptions): Promise<void>;
+//# sourceMappingURL=env.d.ts.map