@contentful/experience-design-system-cli 2.32.1-dev-build-10912f6.0 → 2.32.1-dev-build-1c6a348.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.32.1-dev-build-10912f6.0",
+  "version": "2.32.1-dev-build-1c6a348.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",

package/dist/src/api/clients/abstract-api-client.d.ts

@@ -0,0 +1,24 @@
+export interface AbstractApiClientOptions {
+    host?: string;
+    cmaToken: string;
+    spaceId: string;
+    environmentId: string;
+}
+/**
+ * Shared base for CmaApiClient + EdsiApiClient. Owns the fields, URL
+ * helpers, and the /users/me validateToken flow that both clients need.
+ * Subclasses override validateToken() when they need to add
+ * service-specific follow-ups (e.g. EdsiApiClient calls checkPreflight()
+ * after the base check).
+ */
+export declare abstract class AbstractApiClient {
+    protected readonly host: string;
+    protected readonly token: string;
+    protected readonly spaceId: string;
+    protected readonly environmentId: string;
+    constructor(opts: AbstractApiClientOptions);
+    protected base(): string;
+    protected buildHeaders(): Record<string, string>;
+    validateToken(): Promise<void>;
+    protected onValidateTokenResponse(_res: Response): void;
+}

package/dist/src/api/clients/cma-client.d.ts

@@ -0,0 +1,8 @@
+import { AbstractApiClient } from './abstract-api-client.js';
+import type { CmaClientOptions } from '../../interfaces/clients/cma-client-options.js';
+import type { ExistingEntitiesResponse } from '../../interfaces/responses/existing-entities-response.js';
+export declare class CmaApiClient extends AbstractApiClient {
+    constructor(opts: CmaClientOptions);
+    listExistingEntities(): Promise<ExistingEntitiesResponse>;
+    private listAll;
+}

package/dist/src/api/clients/edsi-client.d.ts

@@ -0,0 +1,44 @@
+import type { ManifestPayload, ServerPreviewResponse, ApplyOperationResponse, BreakingChange } from '@contentful/experience-design-system-types';
+import { AbstractApiClient } from './abstract-api-client.js';
+import type { EdsiClientOptions } from '../../interfaces/clients/edsi-client-options.js';
+import type { PollOptions } from '../../interfaces/clients/poll-options.js';
+export declare const DEFAULT_HOST = "https://api.contentful.com";
+export declare const PREVIEW_ERROR_PREFIX = "preview failed:";
+export declare const APPLY_ERROR_PREFIX = "apply failed:";
+export declare const VALIDATION_FAILED_CODE = "\"ValidationFailed\"";
+export interface PreviewValidationError {
+    componentName: string;
+    path: string;
+    message: string;
+}
+/**
+ * Parse the JSON body of a 422 from `previewImport()` into structured
+ * per-component validation errors. Returns [] for any malformed input
+ * so callers can fall back to the generic error path without try/catch.
+ *
+ * Path shape: `manifest:components/<Name>/$slots/<key>` or
+ * `manifest:components/<Name>/$properties/<key>`. Only the component
+ * name is extracted today; `path` and `message` are kept verbatim so
+ * future surfaces (debug logging, headless retry in SP-4) can render
+ * the field-level detail.
+ */
+export declare function parsePreviewValidationErrors(body: string): PreviewValidationError[];
+export declare function sanitizeBreakingChanges(raw: unknown): BreakingChange[];
+export declare class EdsiApiClient extends AbstractApiClient {
+    private retry;
+    private lastRequestId?;
+    getLastRequestId(): string | undefined;
+    private noteRequestId;
+    protected onValidateTokenResponse(res: Response): void;
+    constructor(opts: EdsiClientOptions);
+    private headers;
+    private requestWithRetry;
+    validateToken(): Promise<void>;
+    checkPreflight(): Promise<void>;
+    previewImport(manifest: ManifestPayload, allowDeletions?: boolean): Promise<ServerPreviewResponse>;
+    applyImport(manifest: ManifestPayload, options: {
+        acknowledgeBreakingChanges: boolean;
+        allowDeletions?: boolean;
+    }): Promise<ApplyOperationResponse>;
+    pollOperation(operationId: string, opts?: PollOptions): Promise<ApplyOperationResponse>;
+}

package/dist/src/api/index.d.ts

@@ -0,0 +1,10 @@
+export { CmaApiClient } from './clients/cma-client.js';
+export { EdsiApiClient, DEFAULT_HOST, PREVIEW_ERROR_PREFIX, APPLY_ERROR_PREFIX, VALIDATION_FAILED_CODE, parsePreviewValidationErrors, sanitizeBreakingChanges, } from './clients/edsi-client.js';
+export type { PreviewValidationError } from './clients/edsi-client.js';
+export { ApiError } from '../errors/api-error.js';
+export type { CmaClientOptions } from '../interfaces/clients/cma-client-options.js';
+export type { EdsiClientOptions } from '../interfaces/clients/edsi-client-options.js';
+export type { PollOptions } from '../interfaces/clients/poll-options.js';
+export type { ExistingComponentEntity } from '../interfaces/responses/existing-component-entity.js';
+export type { ExistingTokenEntity } from '../interfaces/responses/existing-token-entity.js';
+export type { ExistingEntitiesResponse } from '../interfaces/responses/existing-entities-response.js';

package/dist/src/apply/api-client.d.ts

@@ -1,68 +1,4 @@
-import type { ManifestPayload, ServerPreviewResponse, ApplyOperationResponse, BreakingChange } from '@contentful/experience-design-system-types';
-export declare const DEFAULT_HOST = "https://api.contentful.com";
-export declare const PREVIEW_ERROR_PREFIX = "preview failed:";
-export declare const APPLY_ERROR_PREFIX = "apply failed:";
-export declare const VALIDATION_FAILED_CODE = "\"ValidationFailed\"";
-export interface ApiClientOptions {
-    host?: string;
-    cmaToken: string;
-    spaceId: string;
-    environmentId: string;
-    retry?: {
-        maxAttempts?: number;
-        initialDelayMs?: number;
-        maxDelayMs?: number;
-        sleep?: (delayMs: number) => Promise<void>;
-    };
-}
-export declare class ApiError extends Error {
-    readonly status: number;
-    readonly body: string;
-    readonly guidance?: string | undefined;
-    constructor(message: string, status: number, body: string, guidance?: string | undefined);
-}
-export interface PreviewValidationError {
-    componentName: string;
-    path: string;
-    message: string;
-}
-/**
- * Parse the JSON body of a 422 from `previewImport()` into structured
- * per-component validation errors. Returns [] for any malformed input
- * so callers can fall back to the generic error path without try/catch.
- *
- * Path shape: `manifest:components/<Name>/$slots/<key>` or
- * `manifest:components/<Name>/$properties/<key>`. Only the component
- * name is extracted today; `path` and `message` are kept verbatim so
- * future surfaces (debug logging, headless retry in SP-4) can render
- * the field-level detail.
- */
-export declare function parsePreviewValidationErrors(body: string): PreviewValidationError[];
-export declare function sanitizeBreakingChanges(raw: unknown): BreakingChange[];
-export declare class ImportApiClient {
-    private host;
-    private token;
-    private spaceId;
-    private environmentId;
-    private retry;
-    private lastRequestId?;
-    getLastRequestId(): string | undefined;
-    private noteRequestId;
-    constructor(opts: ApiClientOptions);
-    private base;
-    private headers;
-    private requestWithRetry;
-    validateToken(): Promise<void>;
-    checkPreflight(): Promise<void>;
-    previewImport(manifest: ManifestPayload, allowDeletions?: boolean): Promise<ServerPreviewResponse>;
-    applyImport(manifest: ManifestPayload, options: {
-        acknowledgeBreakingChanges: boolean;
-        allowDeletions?: boolean;
-    }): Promise<ApplyOperationResponse>;
-    pollOperation(operationId: string, opts?: {
-        intervalMs?: number;
-        maxIntervalMs?: number;
-        maxAttempts?: number;
-        onProgress?: (op: ApplyOperationResponse) => void;
-    }): Promise<ApplyOperationResponse>;
-}
+export { EdsiApiClient, EdsiApiClient as ImportApiClient, DEFAULT_HOST, PREVIEW_ERROR_PREFIX, APPLY_ERROR_PREFIX, VALIDATION_FAILED_CODE, parsePreviewValidationErrors, sanitizeBreakingChanges, } from '../api/clients/edsi-client.js';
+export type { PreviewValidationError } from '../api/clients/edsi-client.js';
+export { ApiError } from '../errors/api-error.js';
+export type { EdsiClientOptions as ApiClientOptions } from '../interfaces/clients/edsi-client-options.js';

package/dist/src/errors/api-error.d.ts

@@ -0,0 +1,6 @@
+export declare class ApiError extends Error {
+    readonly status: number;
+    readonly body: string;
+    readonly guidance?: string | undefined;
+    constructor(message: string, status: number, body: string, guidance?: string | undefined);
+}

package/dist/src/helpers/http.d.ts

@@ -0,0 +1,4 @@
+export declare function buildHeaders(token: string): Record<string, string>;
+export declare function request(url: string, options: RequestInit & {
+    token: string;
+}): Promise<Response>;

package/dist/src/helpers/url.d.ts

@@ -0,0 +1,4 @@
+export declare const DEFAULT_API_HOST = "https://api.contentful.com";
+export declare const DEFAULT_CONFIGURED_HOST = "api.contentful.com";
+export declare function toConfiguredHost(host?: string): string | undefined;
+export declare function toApiHost(host?: string): string;

package/dist/src/host-utils.d.ts

@@ -1,4 +1 @@
-export declare const DEFAULT_API_HOST = "https://api.contentful.com";
-export declare const DEFAULT_CONFIGURED_HOST = "api.contentful.com";
-export declare function toConfiguredHost(host?: string): string | undefined;
-export declare function toApiHost(host?: string): string;
+export { DEFAULT_API_HOST, DEFAULT_CONFIGURED_HOST, toConfiguredHost, toApiHost } from './helpers/url.js';

package/dist/src/import/orchestrator.d.ts

@@ -7,6 +7,7 @@ export interface PipelineOptions {
     cmaToken?: string;
     agent: string;
     model?: string;
+    bedrock?: boolean;
     skipAnalyze: boolean;
     skipGenerate: boolean;
     print: boolean;
@@ -27,6 +28,15 @@ export interface PipelineOptions {
     /** When true, auto-reject cycle participants and retry push instead of surfacing an error. */
     autoRejectCycles?: boolean;
     allowDeletions?: boolean;
+    /**
+     * Fetch existing Components + DesignTokens from the target space+env
+     * and persist them under outDir/.existing-entities.json so downstream
+     * agent steps can consume them as context. Requires spaceId +
+     * environmentId + cmaToken; skipped with a warning otherwise. No-op
+     * for the agent flow in this PR — the file is written but nothing
+     * reads it yet.
+     */
+    withSpaceContext?: boolean;
     compositionMode?: CompositionMode;
     compositionMap?: string;
     compositionAgent?: boolean;

package/dist/src/import/tui/WizardApp.d.ts

@@ -7,6 +7,7 @@ export declare function buildSelectAgentArgs(opts: {
     sessionId: string;
     agent: string;
     model?: string;
+    bedrock?: boolean;
     selectPromptPath?: string;
     noCache?: boolean;
 }): string[];
@@ -23,6 +24,7 @@ export declare function buildGenerateComponentsArgs(opts: {
     tokensPath?: string;
     agent: string;
     model?: string;
+    bedrock?: boolean;
     noCache?: boolean;
     generatePromptPath?: string;
 }): string[];
@@ -49,6 +51,7 @@ export type WizardAppProps = {
     initialHost?: string;
     initialAgent?: string;
     initialModel?: string;
+    bedrock?: boolean;
     initialProjectPath?: string;
     host?: string;
     autoAcceptScope?: boolean;
@@ -80,4 +83,4 @@ export type WizardAppProps = {
     onRunPicked?: (selection: RunPickerSelection) => void;
     allowDeletions?: boolean;
 };
-export declare function WizardApp({ initialSpaceId, initialEnvironmentId, initialCmaToken, initialHost, initialAgent, initialModel, initialProjectPath, host, autoAcceptScope, autoRejectCycles, compositionMode, compositionMap, compositionAgent, compositionAgentMode, compositionRefresh, generateMap, promptOverrides, noCache, autoFilter, livePreview, noPush, noSave, outDirOverride, onConflictMode, selectPromptPath, generatePromptPath, skipMapTokens, seedExtractSessionId, seedGenerateSessionId, seedTokenSessionId, seedTokensPath, initialStep, initialRawTokensPath, initialRuns, onRunPicked, allowDeletions, }?: WizardAppProps): React.ReactElement;
+export declare function WizardApp({ initialSpaceId, initialEnvironmentId, initialCmaToken, initialHost, initialAgent, initialModel, bedrock, initialProjectPath, host, autoAcceptScope, autoRejectCycles, compositionMode, compositionMap, compositionAgent, compositionAgentMode, compositionRefresh, generateMap, promptOverrides, noCache, autoFilter, livePreview, noPush, noSave, outDirOverride, onConflictMode, selectPromptPath, generatePromptPath, skipMapTokens, seedExtractSessionId, seedGenerateSessionId, seedTokenSessionId, seedTokensPath, initialStep, initialRawTokensPath, initialRuns, onRunPicked, allowDeletions, }?: WizardAppProps): React.ReactElement;

package/dist/src/index.js

@@ -275,51 +275,70 @@ function resolveBinary(agent) {
     return override.trim();
   return AGENT_BINARIES[agent];
 }
-function resolveAgentModel(agent, explicit) {
+function agentSupportsBedrock(agent) {
+  return BEDROCK_CAPABLE_AGENTS.has(agent);
+}
+function resolveAgentModel(agent, explicit, bedrock = false) {
   if (explicit && explicit.trim())
     return explicit.trim();
   const override = process.env[`EDS_AGENT_MODEL_${agent.toUpperCase()}`];
   if (override && override.trim())
     return override.trim();
+  if (bedrock && agent === "codex")
+    return DEFAULT_CODEX_BEDROCK_MODEL;
+  if (bedrock && agent === "opencode")
+    return withBedrockProviderPrefix(DEFAULT_MODELS.opencode);
   return DEFAULT_MODELS[agent];
 }
-function buildArgs(agent, prompt2, model, promptViaStdin = false) {
-  const resolvedModel = resolveAgentModel(agent, model);
-  const modelArg = resolvedModel ? ["--model", resolvedModel] : [];
+function withBedrockProviderPrefix(model) {
+  return model.includes("/") ? model : `amazon-bedrock/${model}`;
+}
+function codexBedrockConfigArgs() {
+  const region = process.env.AWS_REGION?.trim() || process.env.AWS_DEFAULT_REGION?.trim() || DEFAULT_CODEX_BEDROCK_REGION;
+  return ["-c", "model_provider=amazon-bedrock", "-c", `model_providers.amazon-bedrock.region=${region}`];
+}
+function buildArgs(agent, prompt2, model, promptViaStdin = false, bedrock = false) {
+  const modelArg = ["--model", resolveAgentModel(agent, model, bedrock)];
   const promptArg = promptViaStdin ? [] : [prompt2];
   switch (agent) {
     case "claude":
       return ["--print", ...modelArg, ...promptArg];
-    case "codex":
-      return ["exec", ...modelArg, "--dangerously-bypass-approvals-and-sandbox", ...promptArg];
+    case "codex": {
+      const bedrockArgs = bedrock ? codexBedrockConfigArgs() : [];
+      return ["exec", ...bedrockArgs, ...modelArg, "--dangerously-bypass-approvals-and-sandbox", ...promptArg];
+    }
     case "opencode":
       return ["run", ...modelArg, ...promptArg];
     case "cursor":
       return ["--print", ...modelArg, ...promptArg];
     case "copilot": {
       const copilotModel = resolveAgentModel("copilot", model);
-      const copilotModelArg = !copilotModel || copilotModel === "Auto" ? [] : ["--model", copilotModel];
+      const copilotModelArg = copilotModel === "Auto" ? [] : ["--model", copilotModel];
       return ["-p", ...promptArg, ...copilotModelArg, "--allow-all-tools"];
     }
   }
 }
 async function runAgent(options) {
   const { agent, prompt: prompt2, timeoutMs, model, onOutput, promptViaStdin, onDebugEvent } = options;
+  const bedrock = options.bedrock ?? process.env.EDS_BEDROCK === "1";
   const binary = resolveBinary(agent);
   const useStdin2 = !!promptViaStdin;
-  const args = buildArgs(agent, prompt2, model, useStdin2);
+  const args = buildArgs(agent, prompt2, model, useStdin2, bedrock);
   const startedAt = Date.now();
   onDebugEvent?.("run.start", {
     agent,
     binary,
     model,
+    bedrock: !!bedrock,
     timeoutMs,
     promptLen: prompt2.length,
     promptHead: prompt2.slice(0, 500)
   });
   return new Promise((resolve27) => {
+    const bedrockEnv = bedrock ? BEDROCK_ENV_BY_AGENT[agent] : void 0;
     const child = spawn(binary, args, {
-      stdio: ["pipe", "pipe", "pipe"]
+      stdio: ["pipe", "pipe", "pipe"],
+      ...bedrockEnv ? { env: { ...process.env, ...bedrockEnv } } : {}
     });
     if (useStdin2 && child.stdin) {
       child.stdin.on("error", () => {
@@ -437,7 +456,7 @@ function extractSentinelOutput(stdout) {
     return "multiple";
   return stdout.slice(startIdx + START.length, endIdx).trim();
 }
-var VALID_SELECT_TOOL_NAMES, VALID_TOOL_NAMES, VALID_TOKEN_TOOL_NAMES, VALID_CDF_TYPES, VALID_CATEGORIES, AGENT_BINARIES, DEFAULT_MODELS;
+var VALID_SELECT_TOOL_NAMES, VALID_TOOL_NAMES, VALID_TOKEN_TOOL_NAMES, VALID_CDF_TYPES, VALID_CATEGORIES, AGENT_BINARIES, BEDROCK_ENV_BY_AGENT, BEDROCK_CAPABLE_AGENTS, DEFAULT_CODEX_BEDROCK_REGION, DEFAULT_MODELS, DEFAULT_CODEX_BEDROCK_MODEL;
 var init_agent_runner = __esm({
   "packages/experience-design-system-generation/dist/src/agent-runner.js"() {
     "use strict";
@@ -454,14 +473,22 @@ var init_agent_runner = __esm({
       cursor: "cursor-agent",
       copilot: "copilot"
     };
+    BEDROCK_ENV_BY_AGENT = {
+      claude: { CLAUDE_CODE_USE_BEDROCK: "1" }
+    };
+    BEDROCK_CAPABLE_AGENTS = /* @__PURE__ */ new Set(["claude", "codex", "opencode"]);
+    DEFAULT_CODEX_BEDROCK_REGION = "us-east-1";
     DEFAULT_MODELS = {
       claude: "haiku",
+      codex: "gpt-5.6-luna",
+      // requires OPENAI_API_KEY; ChatGPT account users must pass --model
       opencode: "claude-haiku-4-5",
       cursor: "gpt-mini",
       // cursor alias for gpt-5.4-mini-medium; haiku not in cursor's catalog
       copilot: "Auto"
       // the only model guaranteed on every Copilot plan (Free/Pro/Business/Enterprise); Pro+ users override via EDS_AGENT_MODEL_COPILOT
     };
+    DEFAULT_CODEX_BEDROCK_MODEL = "openai.gpt-5.6-luna";
   }
 });
 
@@ -851,6 +878,7 @@ var src_exports = {};
 __export(src_exports, {
   AGENT_NAMES: () => AGENT_NAMES,
   DEFAULT_AGENT_NAME: () => DEFAULT_AGENT_NAME,
+  agentSupportsBedrock: () => agentSupportsBedrock,
   buildArgs: () => buildArgs,
   buildPrompt: () => buildPrompt,
   checkAgentAuth: () => checkAgentAuth,
@@ -12575,7 +12603,7 @@ var init_src3 = __esm({
   }
 });
 
-// packages/experience-design-system-cli/src/host-utils.ts
+// packages/experience-design-system-cli/src/helpers/url.ts
 function trimTrailingSlashes(value) {
   return value.replace(/\/+$/, "");
 }
@@ -12598,8 +12626,8 @@ function toApiHost(host) {
   return `https://${normalized}`;
 }
 var DEFAULT_API_HOST, DEFAULT_CONFIGURED_HOST;
-var init_host_utils = __esm({
-  "packages/experience-design-system-cli/src/host-utils.ts"() {
+var init_url = __esm({
+  "packages/experience-design-system-cli/src/helpers/url.ts"() {
     "use strict";
     DEFAULT_API_HOST = "https://api.contentful.com";
     DEFAULT_CONFIGURED_HOST = "api.contentful.com";
@@ -12806,7 +12834,99 @@ var init_user_agent = __esm({
   }
 });
 
-// packages/experience-design-system-cli/src/apply/api-client.ts
+// packages/experience-design-system-cli/src/helpers/http.ts
+function buildHeaders(token) {
+  return {
+    Authorization: `Bearer ${token}`,
+    "Content-Type": "application/json",
+    "X-Contentful-User-Agent": buildUserAgent()
+  };
+}
+async function request(url, options) {
+  const init = {
+    method: options.method ?? "GET",
+    headers: buildHeaders(options.token)
+  };
+  if (options.body) init.body = options.body;
+  return fetch(url, init);
+}
+var init_http = __esm({
+  "packages/experience-design-system-cli/src/helpers/http.ts"() {
+    "use strict";
+    init_user_agent();
+  }
+});
+
+// packages/experience-design-system-cli/src/errors/api-error.ts
+var ERROR_BODY_LOG_CAP, ApiError;
+var init_api_error = __esm({
+  "packages/experience-design-system-cli/src/errors/api-error.ts"() {
+    "use strict";
+    ERROR_BODY_LOG_CAP = 16384;
+    ApiError = class extends Error {
+      constructor(message, status, body, guidance) {
+        super(message);
+        this.status = status;
+        this.body = body;
+        this.guidance = guidance;
+        if (body) {
+          const trimmed = body.length > ERROR_BODY_LOG_CAP ? body.slice(0, ERROR_BODY_LOG_CAP) + "\u2026" : body;
+          this.message = `${message}
+${trimmed}`;
+        }
+      }
+      status;
+      body;
+      guidance;
+    };
+  }
+});
+
+// packages/experience-design-system-cli/src/api/clients/abstract-api-client.ts
+var AbstractApiClient;
+var init_abstract_api_client = __esm({
+  "packages/experience-design-system-cli/src/api/clients/abstract-api-client.ts"() {
+    "use strict";
+    init_url();
+    init_http();
+    init_api_error();
+    AbstractApiClient = class {
+      host;
+      token;
+      spaceId;
+      environmentId;
+      constructor(opts) {
+        this.host = toApiHost(opts.host);
+        this.token = opts.cmaToken;
+        this.spaceId = opts.spaceId;
+        this.environmentId = opts.environmentId;
+      }
+      base() {
+        return `${this.host}/spaces/${this.spaceId}/environments/${this.environmentId}`;
+      }
+      buildHeaders() {
+        return buildHeaders(this.token);
+      }
+      async validateToken() {
+        const url = `${this.host}/users/me`;
+        const res = await request(url, { token: this.token });
+        this.onValidateTokenResponse(res);
+        if (res.status === 401) {
+          throw new ApiError("CMA token is invalid or revoked", res.status, await res.text());
+        }
+        if (!res.ok) {
+          throw new ApiError(`unexpected error validating token: ${res.status}`, res.status, await res.text());
+        }
+      }
+      // Hook for subclasses to observe the raw /users/me response (e.g. capture
+      // x-contentful-request-id). Default is a no-op.
+      onValidateTokenResponse(_res) {
+      }
+    };
+  }
+});
+
+// packages/experience-design-system-cli/src/api/clients/edsi-client.ts
 function defaultSleep(delayMs) {
   return new Promise((resolve27) => setTimeout(resolve27, delayMs));
 }
@@ -12889,48 +13009,20 @@ function isApsDenialBody(body) {
     return false;
   }
 }
-async function request(url, options) {
-  const headers = {
-    Authorization: `Bearer ${options.token}`,
-    "Content-Type": "application/json",
-    "X-Contentful-User-Agent": buildUserAgent()
-  };
-  const init = {
-    method: options.method ?? "GET",
-    headers
-  };
-  if (options.body) init.body = options.body;
-  return fetch(url, init);
-}
-var PREVIEW_ERROR_PREFIX, APPLY_ERROR_PREFIX, VALIDATION_FAILED_CODE, MAX_RETRY_AFTER_MS, ERROR_BODY_LOG_CAP, ApiError, COMPONENT_PATH_PREFIX, PROPERTY_BREAKING_REASONS, SLOT_BREAKING_REASONS, ImportApiClient;
-var init_api_client = __esm({
-  "packages/experience-design-system-cli/src/apply/api-client.ts"() {
+var PREVIEW_ERROR_PREFIX, APPLY_ERROR_PREFIX, VALIDATION_FAILED_CODE, MAX_RETRY_AFTER_MS, COMPONENT_PATH_PREFIX, PROPERTY_BREAKING_REASONS, SLOT_BREAKING_REASONS, EdsiApiClient;
+var init_edsi_client = __esm({
+  "packages/experience-design-system-cli/src/api/clients/edsi-client.ts"() {
     "use strict";
     init_src3();
-    init_host_utils();
+    init_url();
     init_debug_logger();
-    init_user_agent();
+    init_http();
+    init_api_error();
+    init_abstract_api_client();
     PREVIEW_ERROR_PREFIX = "preview failed:";
     APPLY_ERROR_PREFIX = "apply failed:";
     VALIDATION_FAILED_CODE = '"ValidationFailed"';
     MAX_RETRY_AFTER_MS = 6e4;
-    ERROR_BODY_LOG_CAP = 16384;
-    ApiError = class extends Error {
-      constructor(message, status, body, guidance) {
-        super(message);
-        this.status = status;
-        this.body = body;
-        this.guidance = guidance;
-        if (body) {
-          const trimmed = body.length > ERROR_BODY_LOG_CAP ? body.slice(0, ERROR_BODY_LOG_CAP) + "\u2026" : body;
-          this.message = `${message}
-${trimmed}`;
-        }
-      }
-      status;
-      body;
-      guidance;
-    };
     COMPONENT_PATH_PREFIX = "manifest:components/";
     PROPERTY_BREAKING_REASONS = /* @__PURE__ */ new Set([
       "removed",
@@ -12939,11 +13031,7 @@ ${trimmed}`;
       "validation_narrowed"
     ]);
     SLOT_BREAKING_REASONS = /* @__PURE__ */ new Set(["slot_removed", "slot_allowed_components_narrowed"]);
-    ImportApiClient = class {
-      host;
-      token;
-      spaceId;
-      environmentId;
+    EdsiApiClient = class extends AbstractApiClient {
       retry;
       lastRequestId;
       getLastRequestId() {
@@ -12953,11 +13041,11 @@ ${trimmed}`;
         const requestId = response.headers.get("x-contentful-request-id");
         if (requestId) this.lastRequestId = requestId;
       }
+      onValidateTokenResponse(res) {
+        this.noteRequestId(res);
+      }
       constructor(opts) {
-        this.host = toApiHost(opts.host);
-        this.token = opts.cmaToken;
-        this.spaceId = opts.spaceId;
-        this.environmentId = opts.environmentId;
+        super(opts);
         const initialDelayMs = Math.max(0, opts.retry?.initialDelayMs ?? 250);
         this.retry = {
           maxAttempts: Math.max(1, Math.floor(opts.retry?.maxAttempts ?? 3)),
@@ -12966,15 +13054,8 @@ ${trimmed}`;
           sleep: opts.retry?.sleep ?? defaultSleep
         };
       }
-      base() {
-        return `${this.host}/spaces/${this.spaceId}/environments/${this.environmentId}`;
-      }
       headers() {
-        return {
-          Authorization: `Bearer ${this.token}`,
-          "Content-Type": "application/json",
-          "X-Contentful-User-Agent": buildUserAgent()
-        };
+        return this.buildHeaders();
       }
       async requestWithRetry(phase, errorPrefix, makeCall, context = {}) {
         const debug = getDebugLogger();
@@ -13041,15 +13122,7 @@ ${trimmed}`;
         throw new Error("Retry attempts exhausted");
       }
       async validateToken() {
-        const url = `${this.host}/users/me`;
-        const res = await request(url, { token: this.token });
-        this.noteRequestId(res);
-        if (res.status === 401) {
-          throw new ApiError("CMA token is invalid or revoked", res.status, await res.text());
-        }
-        if (!res.ok) {
-          throw new ApiError(`unexpected error validating token: ${res.status}`, res.status, await res.text());
-        }
+        await super.validateToken();
         await this.checkPreflight();
       }
       // Probe the sources-api preflight endpoint to catch APS-denied users up-front,
@@ -13205,6 +13278,15 @@ ${trimmed}`;
   }
 });
 
+// packages/experience-design-system-cli/src/apply/api-client.ts
+var init_api_client = __esm({
+  "packages/experience-design-system-cli/src/apply/api-client.ts"() {
+    "use strict";
+    init_edsi_client();
+    init_api_error();
+  }
+});
+
 // packages/experience-design-system-cli/src/lib/error-parser.ts
 function stripLambdaLogPrefix(body) {
   let out = body.replace(LAMBDA_LOG_PREFIX_RE, "");
@@ -14193,6 +14275,14 @@ var init_strip_allowed_components = __esm({
   }
 });
 
+// packages/experience-design-system-cli/src/host-utils.ts
+var init_host_utils = __esm({
+  "packages/experience-design-system-cli/src/host-utils.ts"() {
+    "use strict";
+    init_url();
+  }
+});
+
 // packages/experience-design-system-cli/src/credentials-store.ts
 var credentials_store_exports = {};
 __export(credentials_store_exports, {
@@ -14808,7 +14898,7 @@ async function resolveSharedInputs(opts) {
   if (opts.tokens) {
     tokens = await readTokensFromPath("--tokens", opts.tokens);
   }
-  const client2 = new ImportApiClient({
+  const client2 = new EdsiApiClient({
     host: opts.host,
     cmaToken,
     spaceId,
@@ -15548,7 +15638,7 @@ function App({ sessionId: sessionId2, artifactsRoot, reviewRoot }) {
         tokens
       );
       if (!manifest.componentsManifest) manifest.componentsManifest = {};
-      const client2 = new ImportApiClient({ cmaToken, spaceId, environmentId });
+      const client2 = new EdsiApiClient({ cmaToken, spaceId, environmentId });
       const preview = await client2.previewImport(manifest, true);
       const annotations = {};
       for (const item of preview.components.new) {
@@ -16570,7 +16660,7 @@ var init_save_path_resolver = __esm({
 });
 
 // packages/experience-design-system-cli/src/runs/store.ts
-import { readFile as readFile22, writeFile as writeFile5, mkdir as mkdir6, rename } from "node:fs/promises";
+import { readFile as readFile22, writeFile as writeFile6, mkdir as mkdir6, rename } from "node:fs/promises";
 import { join as join20 } from "node:path";
 import { homedir as homedir7 } from "node:os";
 import { randomBytes as randomBytes2 } from "node:crypto";
@@ -16633,7 +16723,7 @@ async function writeAtomic(file) {
   await mkdir6(RUNS_DIR, { recursive: true });
   const body = JSON.stringify(file, null, 2) + "\n";
   const tmp = `${RUNS_PATH}.${process.pid}.${Date.now()}.tmp`;
-  await writeFile5(tmp, body, { mode: 384 });
+  await writeFile6(tmp, body, { mode: 384 });
   await rename(tmp, RUNS_PATH);
 }
 async function appendRun(input) {
@@ -24115,7 +24205,7 @@ async function runLivePreview(opts) {
     tokens = await readTokensFromPath("tokens", tokensPath);
   }
   const manifest = buildManifest3(components, tokens, { deleteAllComponents: opts.deleteAllComponents === true });
-  const client2 = new ImportApiClient({ host, cmaToken, spaceId, environmentId });
+  const client2 = new EdsiApiClient({ host, cmaToken, spaceId, environmentId });
   const startedAt = Date.now();
   let timeoutHandle;
   const timeoutPromise = new Promise((_resolve, reject) => {
@@ -27590,6 +27680,7 @@ import { jsx as jsx52, jsxs as jsxs51 } from "react/jsx-runtime";
 function buildSelectAgentArgs(opts) {
   const args = ["analyze", "select-agent", "--agent", opts.agent, "--session", opts.sessionId, "--exclude-invalid"];
   if (opts.model) args.push("--model", opts.model);
+  if (opts.bedrock) args.push("--bedrock");
   if (opts.selectPromptPath) args.push("--select-prompt-path", opts.selectPromptPath);
   if (opts.noCache) args.push("--no-cache");
   return args;
@@ -27625,6 +27716,7 @@ function buildGenerateComponentsArgs(opts) {
   const args = ["generate", "components", "--agent", opts.agent, "--session", opts.sessionId];
   if (opts.tokensPath) args.push("--tokens", opts.tokensPath);
   if (opts.model) args.push("--model", opts.model);
+  if (opts.bedrock) args.push("--bedrock");
   if (opts.noCache) args.push("--no-cache");
   if (opts.generatePromptPath) args.push("--generate-prompt-path", opts.generatePromptPath);
   return args;
@@ -27667,6 +27759,7 @@ function WizardApp({
   initialHost,
   initialAgent,
   initialModel,
+  bedrock = false,
   initialProjectPath,
   host,
   autoAcceptScope = false,
@@ -27728,6 +27821,7 @@ function WizardApp({
     step: modifyEntryReady || rawTokensEntryReady || pushFromPickerReady ? initialStepResolved : initialRuns && initialRuns.length > 0 ? "run-picker" : initialStepResolved,
     agent: initialAgent ?? "claude",
     ...initialModel ? { agentModel: initialModel } : {},
+    ...bedrock ? { bedrock: true } : {},
     projectPath: initialProjectPath ?? "",
     outDir: initialOutDir,
     rawTokensPath: rawTokensEntryReady ? initialRawTokensPath : "",
@@ -27867,6 +27961,7 @@ If you are using AWS Bedrock, run:
     const result = await new Promise((res) => {
       const tokenArgs = [findCliPath(), "generate", "tokens", "--agent", state.agent, "--raw-tokens", rawTokensPath];
       if (state.agentModel) tokenArgs.push("--model", state.agentModel);
+      if (state.bedrock) tokenArgs.push("--bedrock");
       const child = spawn4("node", tokenArgs);
       let stdout2 = "";
       let stderr = "";
@@ -27987,6 +28082,7 @@ If you are using AWS Bedrock, run:
         if (generateMap) extractArgs.push("--generate-map", generateMap);
         for (const p of promptOverrides ?? []) extractArgs.push("--prompt", p);
         if (state.agent) extractArgs.push("--agent", state.agent);
+        if (state.bedrock) extractArgs.push("--bedrock");
       }
       const child = spawn4("node", extractArgs);
       let stdout2 = "";
@@ -28078,6 +28174,7 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
         sessionId: sessionId2,
         agent: state.agent,
         ...state.agentModel ? { model: state.agentModel } : {},
+        ...state.bedrock ? { bedrock: true } : {},
         selectPromptPath,
         noCache
       });
@@ -28176,6 +28273,7 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
         tokensPath,
         agent: state.agent,
         ...state.agentModel ? { model: state.agentModel } : {},
+        ...state.bedrock ? { bedrock: true } : {},
         noCache: effectiveNoCache
       })
     ];
@@ -28245,6 +28343,7 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
         tokensPath,
         agent: state.agent,
         ...state.agentModel ? { model: state.agentModel } : {},
+        ...state.bedrock ? { bedrock: true } : {},
         noCache: effectiveNoCache,
         generatePromptPath
       })
@@ -28326,7 +28425,7 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
     update({ step: "credentials", credentialsValidating: true, credentialsError: "" });
     try {
       const resolvedHost = resolveWizardHost(host2);
-      const client2 = new ImportApiClient({
+      const client2 = new EdsiApiClient({
         cmaToken,
         spaceId,
         environmentId,
@@ -28400,7 +28499,7 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
     update({ step: "previewing" });
     const resolvedHost = resolveWizardHost(host2);
     try {
-      const client2 = new ImportApiClient({
+      const client2 = new EdsiApiClient({
         cmaToken,
         spaceId,
         environmentId,
@@ -28562,7 +28661,7 @@ If using a custom --host, make sure the space exists on that host.`
     update({ step: "pushing", pushProgress: null });
     try {
       const resolvedHost = resolveWizardHost(host2);
-      const client2 = new ImportApiClient({
+      const client2 = new EdsiApiClient({
         cmaToken,
         spaceId,
         environmentId,
@@ -29752,12 +29851,15 @@ import { isAbsolute as isAbsolute4, join as join15, relative as relative3, resol
 init_src();
 var AGENT_DESCRIPTION = `Agent to use: ${AGENT_NAMES.join(", ")} (defaults to value saved by experiences setup)`;
 var MODEL_DESCRIPTION = "Model to use (defaults to a lightweight per-agent model; override with EDS_AGENT_MODEL_<AGENT>)";
+var BEDROCK_AGENTS = AGENT_NAMES.filter((agent) => agentSupportsBedrock(agent)).join(", ");
+var BEDROCK_DESCRIPTION = `Route the selected agent through AWS Bedrock instead of its default model provider (requires AWS credentials in the environment: AWS_PROFILE, or AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY/AWS_SESSION_TOKEN, plus AWS_REGION). Only supported by agents with a Bedrock routing mechanism (currently: ${BEDROCK_AGENTS}).`;
 function addAgentModelOptions(cmd, config = {}) {
   const { agentDescription = AGENT_DESCRIPTION, includeModel = true, modelDescription = MODEL_DESCRIPTION } = config;
   cmd.option("--agent <name>", agentDescription);
   if (includeModel) {
     cmd.option("--model <name>", modelDescription);
   }
+  cmd.option("--bedrock", BEDROCK_DESCRIPTION);
   return cmd;
 }
 
@@ -30546,6 +30648,12 @@ function registerAnalyzeSelectAgentCommand(program) {
         return;
       }
       const agent = agentName;
+      if (opts.bedrock && !agentSupportsBedrock(agent)) {
+        process.stderr.write(`Error: --bedrock is not supported for --agent ${agent}
+`);
+        await exitWithAnalytics(1);
+        return;
+      }
       const selectPromptPath = opts.selectPromptPath ?? savedCreds.selectPromptPath;
       if (selectPromptPath) {
         const resolvedPath = resolve12(selectPromptPath);
@@ -31789,6 +31897,14 @@ function registerAnalyzeCommand(program) {
       }
       return v;
     })();
+    if (opts.bedrock) {
+      const bedrockAgent = resolveCompositionAgentName(opts.agent);
+      if (!agentSupportsBedrock(bedrockAgent)) {
+        process.stderr.write(`Error: --bedrock is not supported for --agent ${bedrockAgent}
+`);
+        process.exit(1);
+      }
+    }
     const projectRoot = resolve15(opts.project);
     const outDir = join15(projectRoot, ".contentful");
     let sourceDirectory;
@@ -32635,6 +32751,9 @@ async function runGenerateSkill(skill, opts, verbose = false) {
     );
   }
   const agent = agentName;
+  if (opts.bedrock && !agentSupportsBedrock(agent)) {
+    die2(`Error: --bedrock is not supported for --agent ${agent}`);
+  }
   const generatePromptPath = skill === "components" ? opts.generatePromptPath ?? savedCreds.generatePromptPath : void 0;
   if (generatePromptPath) {
     if (!await pathExists3(resolve17(generatePromptPath))) {
@@ -34299,6 +34418,7 @@ function registerMapTokensCommand(program) {
 }
 
 // packages/experience-design-system-cli/src/import/command.ts
+init_src();
 init_path_utils();
 import { resolve as resolve25, join as join25 } from "node:path";
 
@@ -34307,14 +34427,52 @@ init_db();
 init_command();
 init_manifest();
 init_api_client();
+import { mkdir as mkdir5, writeFile as writeFile5 } from "node:fs/promises";
+import { join as join18, resolve as resolve21 } from "node:path";
+import { execFile as execFile2 } from "node:child_process";
+
+// packages/experience-design-system-cli/src/api/clients/cma-client.ts
+init_http();
+init_api_error();
+init_abstract_api_client();
+var CMA_PAGE_LIMIT = 100;
+var CmaApiClient = class extends AbstractApiClient {
+  constructor(opts) {
+    super(opts);
+  }
+  async listExistingEntities() {
+    const [components, tokens] = await Promise.all([
+      this.listAll("component_types", "component_types"),
+      this.listAll("design_tokens", "design_tokens")
+    ]);
+    return { components, tokens };
+  }
+  async listAll(resourcePath, opName) {
+    const items = [];
+    let skip = 0;
+    while (true) {
+      const url = `${this.base()}/${resourcePath}?limit=${CMA_PAGE_LIMIT}&skip=${skip}`;
+      const res = await request(url, { token: this.token });
+      if (!res.ok) {
+        throw new ApiError(`${opName} list failed: ${res.status}`, res.status, await res.text());
+      }
+      const page = await res.json();
+      items.push(...page.items);
+      const returned = page.items.length;
+      const total = page.total ?? items.length;
+      if (returned === 0 || items.length >= total) break;
+      skip += returned;
+    }
+    return items;
+  }
+};
+
+// packages/experience-design-system-cli/src/import/orchestrator.ts
 init_contentful_urls();
 init_debug_logger();
 init_analytics();
 init_env();
 init_cli_path();
-import { mkdir as mkdir5 } from "node:fs/promises";
-import { join as join18, resolve as resolve21 } from "node:path";
-import { execFile as execFile2 } from "node:child_process";
 async function runStep(args, cliPath, analyticsSessionId, env = {}, streamStderr = false) {
   const debug = getDebugLogger();
   const startedAt = Date.now();
@@ -34422,11 +34580,66 @@ async function runPipeline(opts, progressWriter, cliPathOverride) {
   await mkdir5(outDir, { recursive: true });
   const steps = [];
   let stepNum = 0;
-  const totalSteps = 5 + (opts.print ? 1 : 0);
+  const wantsSpaceContext = opts.withSpaceContext === true;
+  const canFetchSpaceContext = wantsSpaceContext && !!opts.spaceId && !!opts.environmentId && !!opts.cmaToken;
+  const totalSteps = 5 + (opts.print ? 1 : 0) + (canFetchSpaceContext ? 1 : 0);
   function stepLabel(name) {
     stepNum++;
     return `  Step ${stepNum}/${totalSteps}  ${name}  `;
   }
+  if (wantsSpaceContext && !canFetchSpaceContext) {
+    progressWriter(
+      "  Note: --with-space-context requires --space-id, --environment-id, and --cma-token; skipping context fetch."
+    );
+  }
+  if (canFetchSpaceContext) {
+    const fetchLabel = stepLabel("Fetching existing components + design tokens");
+    const fetchStepId = createStep(db, sessionId2, "fetch existing entities", {
+      spaceId: opts.spaceId,
+      environmentId: opts.environmentId
+    });
+    const t0 = Date.now();
+    try {
+      const cma = new CmaApiClient({
+        host: opts.host,
+        cmaToken: opts.cmaToken,
+        spaceId: opts.spaceId,
+        environmentId: opts.environmentId
+      });
+      const result = await cma.listExistingEntities();
+      const fetchDurationMs = Date.now() - t0;
+      const existingEntitiesPath = join18(outDir, ".existing-entities.json");
+      await writeFile5(existingEntitiesPath, JSON.stringify(result, null, 2), "utf8");
+      updateStep(db, fetchStepId, "complete", {
+        components: String(result.components.length),
+        tokens: String(result.tokens.length),
+        path: existingEntitiesPath
+      });
+      progressWriter(
+        `${fetchLabel}\u2713  ${result.components.length} component${result.components.length === 1 ? "" : "s"}, ${result.tokens.length} token${result.tokens.length === 1 ? "" : "s"}  (${(fetchDurationMs / 1e3).toFixed(1)}s)`
+      );
+      steps.push({
+        step: "fetch existing entities",
+        status: "complete",
+        durationMs: fetchDurationMs,
+        detail: { components: result.components.length, tokens: result.tokens.length }
+      });
+    } catch (error) {
+      const fetchDurationMs = Date.now() - t0;
+      const message = error instanceof Error ? error.message : String(error);
+      updateStep(db, fetchStepId, "failed", {}, message);
+      progressWriter(
+        `${fetchLabel}\u26A0  fetch failed, continuing without space context  (${(fetchDurationMs / 1e3).toFixed(1)}s)`
+      );
+      progressWriter(`    ${message.split("\n")[0]}`);
+      steps.push({
+        step: "fetch existing entities",
+        status: "failed",
+        durationMs: fetchDurationMs,
+        error: message
+      });
+    }
+  }
   const analyzeLabel = stepLabel("Statically analyzing project");
   const analyzeSkipped = !opts.noCache && opts.skipAnalyze;
   let extractSessionId = null;
@@ -34454,6 +34667,7 @@ async function runPipeline(opts, progressWriter, cliPathOverride) {
       if (opts.generateMap) analyzeArgs.push("--generate-map", opts.generateMap);
       for (const p of opts.promptOverrides ?? []) analyzeArgs.push("--prompt", p);
       if (opts.agent) analyzeArgs.push("--agent", opts.agent);
+      if (opts.bedrock) analyzeArgs.push("--bedrock");
     }
     const r = await runStep(analyzeArgs, cliPath, sessionId2);
     const durationMs = Date.now() - t0;
@@ -34504,6 +34718,7 @@ async function runPipeline(opts, progressWriter, cliPathOverride) {
     if (useAgentSelect) {
       editArgs = ["analyze", "select-agent", "--session", extractSessionId, "--agent", opts.agent];
       if (opts.model) editArgs.push("--model", opts.model);
+      if (opts.bedrock) editArgs.push("--bedrock");
       if (opts.excludeInvalid) editArgs.push("--exclude-invalid");
       if (opts.noCache) editArgs.push("--no-cache");
       if (opts.selectPromptPath) editArgs.push("--select-prompt-path", opts.selectPromptPath);
@@ -34565,6 +34780,7 @@ async function runPipeline(opts, progressWriter, cliPathOverride) {
     const generateLabel = stepLabel("Categorizing component props");
     const generateArgs = ["generate", "components", "--agent", opts.agent];
     if (opts.model) generateArgs.push("--model", opts.model);
+    if (opts.bedrock) generateArgs.push("--bedrock");
     if (extractSessionId) generateArgs.push("--session", extractSessionId);
     if (opts.dryRun) generateArgs.push("--dry-run");
     if (opts.verbose) generateArgs.push("--verbose");
@@ -35378,7 +35594,10 @@ function registerImportCommand(program) {
     "Override a stage prompt (repeatable). value is a file path or literal text, e.g. --prompt composition=./p.md",
     (v, acc) => [...acc, v],
     []
-  ).option("--auto-reject-cycles", "Automatically reject components involved in slot cycles and retry").option("--auto-filter", "Force the AI auto-filter ON (overrides the credentials.json autoFilter preference)").option(
+  ).option("--auto-reject-cycles", "Automatically reject components involved in slot cycles and retry").option(
+    "--with-space-context",
+    "Fetch existing Components + DesignTokens from the target space+env and persist them under <out>/.existing-entities.json for future agent-context enrichment. Requires --space-id, --environment-id, and --cma-token."
+  ).option("--auto-filter", "Force the AI auto-filter ON (overrides the credentials.json autoFilter preference)").option(
     "--no-auto-filter",
     "Skip the automatic AI pre-filter; jump straight to manual scope-gate (overrides the credentials.json autoFilter preference; no-op when paired with --auto-accept-scope)"
   ).option(
@@ -35595,6 +35814,11 @@ function registerImportCommand(program) {
         const resolvedAgent = resolveAgent(opts.agent, creds.agent);
         const resolvedModel = resolveModel(opts.model, creds.agentModel);
         const resolvedCompositionMode = resolveCompositionMode(opts, creds.compositionMode);
+        if (opts.bedrock && !(isAgentName(resolvedAgent) && agentSupportsBedrock(resolvedAgent))) {
+          process.stderr.write(`Error: --bedrock is not supported for --agent ${resolvedAgent}
+`);
+          process.exit(1);
+        }
         const pickerDecision = await shouldShowRunPicker({
           flags: {
             ...opts.pushFromRun !== void 0 ? { pushFromRun: opts.pushFromRun } : {},
@@ -35623,6 +35847,7 @@ function registerImportCommand(program) {
             initialHost: toConfiguredHost(opts.host ?? creds.host) ?? DEFAULT_CONFIGURED_HOST,
             initialAgent: resolvedAgent,
             ...resolvedModel ? { initialModel: resolvedModel } : {},
+            ...opts.bedrock ? { bedrock: true } : {},
             initialProjectPath: opts.project !== "." ? normalizePath(opts.project) : void 0,
             host: opts.host,
             autoAcceptScope,
@@ -35686,6 +35911,11 @@ function registerImportCommand(program) {
       const headlessAgent = resolveAgent(opts.agent, headlessCreds.agent);
       const headlessModel = resolveModel(opts.model, headlessCreds.agentModel);
       const headlessCompositionMode = resolveCompositionMode(opts, headlessCreds.compositionMode);
+      if (opts.bedrock && !(isAgentName(headlessAgent) && agentSupportsBedrock(headlessAgent))) {
+        process.stderr.write(`Error: --bedrock is not supported for --agent ${headlessAgent}
+`);
+        process.exit(1);
+      }
       const result = await runPipeline(
         {
           project: projectRoot,
@@ -35695,6 +35925,7 @@ function registerImportCommand(program) {
           cmaToken,
           agent: headlessAgent,
           model: headlessModel,
+          ...opts.bedrock ? { bedrock: true } : {},
           tokens: opts.tokens,
           selectAll: opts.selectAll,
           select: opts.select.length > 0 ? opts.select : void 0,
@@ -35713,6 +35944,7 @@ function registerImportCommand(program) {
           dryRun: dryRunForward,
           selectPromptPath: opts.selectPromptPath,
           autoRejectCycles: opts.autoRejectCycles ?? false,
+          withSpaceContext: opts.withSpaceContext ?? false,
           allowDeletions: opts.allowDeletions ?? false,
           compositionMode: headlessCompositionMode,
           ...opts.compositionMap ? { compositionMap: opts.compositionMap } : {},
@@ -36096,15 +36328,26 @@ function pick(items, defaultIdx = 0) {
   process.stdout.write(`     \x1B[2m[s] Skip\x1B[0m
 `);
 }
-async function promptCodexModel(ask = prompt) {
+async function promptCodexModel() {
   if (process.env["OPENAI_API_KEY"]) return void 0;
   info("");
   process.stdout.write(`     \x1B[33m\u26A0\x1B[0m  No OPENAI_API_KEY \u2014 using ChatGPT account authentication.
 `);
-  info("  Tip: run \x1B[1mcodex\x1B[0m then type \x1B[1m/model\x1B[0m to browse the models available to your account.");
-  const model = await ask("  Model name (optional - press Enter for Codex default): ");
-  const trimmed = model.trim();
-  return trimmed || void 0;
+  info("  Tip: run \x1B[1mcodex\x1B[0m then type \x1B[1m/model\x1B[0m to browse all available models.");
+  info("");
+  info("  Choose a model:");
+  info("");
+  pick([
+    { label: "gpt-5.4-mini", description: "fast, lower cost" },
+    { label: "gpt-5.5", description: "most capable" },
+    { label: "gpt-5.4" }
+  ]);
+  info("");
+  const choice = await prompt("  \x1B[2m\u203A\x1B[0m Your choice [1]: ");
+  if (choice === "1" || choice === "") return "gpt-5.4-mini";
+  if (choice === "2") return "gpt-5.5";
+  if (choice === "3") return "gpt-5.4";
+  return void 0;
 }
 async function setupAgent() {
   section("Step 4: Coding agent (claude, codex, opencode, or copilot)", "[required]");
@@ -36131,6 +36374,7 @@ async function setupAgent() {
     const parsed = choice2 === "" ? 1 : parseInt(choice2, 10);
     const idx = Number.isNaN(parsed) || parsed < 1 || parsed > found.length ? 0 : parsed - 1;
     const selected = found[idx];
+    ok(`${selected.name} \x1B[2m(${selected.binary})\x1B[0m selected`);
     const agentModel = selected.binary === "codex" ? await promptCodexModel() : void 0;
     return { agent: selected.binary, agentModel };
   }
@@ -36820,6 +37064,13 @@ async function runBuild(opts) {
     child.on("exit", (code) => settle(code ?? 1));
   });
 }
+function resolveBedrockFromAncestors(actionCommand) {
+  for (let c2 = actionCommand; c2; c2 = c2.parent) {
+    const opts = c2.opts();
+    if (opts.bedrock) return true;
+  }
+  return false;
+}
 function registerImportV2Command(program) {
   program.command("importv2").description("Launch the v2 import TUI (experience-design-system-cli-v2)").action(async () => {
     const { render: render7 } = await import("ink");
@@ -36867,6 +37118,9 @@ function createProgram() {
         break;
       }
     }
+    if (resolveBedrockFromAncestors(actionCommand)) {
+      process.env.EDS_BEDROCK = "1";
+    }
     const chain = [];
     for (let c2 = actionCommand; c2 && c2.parent; c2 = c2.parent) chain.unshift(c2.name());
     const commandChain = chain.join(" ") || actionCommand.name();

package/dist/src/interfaces/clients/cma-client-options.d.ts

@@ -0,0 +1,6 @@
+export interface CmaClientOptions {
+    host?: string;
+    cmaToken: string;
+    spaceId: string;
+    environmentId: string;
+}

package/dist/src/interfaces/clients/edsi-client-options.d.ts

@@ -0,0 +1,12 @@
+export interface EdsiClientOptions {
+    host?: string;
+    cmaToken: string;
+    spaceId: string;
+    environmentId: string;
+    retry?: {
+        maxAttempts?: number;
+        initialDelayMs?: number;
+        maxDelayMs?: number;
+        sleep?: (delayMs: number) => Promise<void>;
+    };
+}

package/dist/src/interfaces/clients/poll-options.d.ts

@@ -0,0 +1,7 @@
+import type { ApplyOperationResponse } from '@contentful/experience-design-system-types';
+export interface PollOptions {
+    intervalMs?: number;
+    maxIntervalMs?: number;
+    maxAttempts?: number;
+    onProgress?: (op: ApplyOperationResponse) => void;
+}

package/dist/src/interfaces/responses/existing-component-entity.d.ts

@@ -0,0 +1,8 @@
+export interface ExistingComponentEntity {
+    id: string;
+    name: string;
+    description?: string;
+    contentProperties?: unknown[];
+    designProperties?: unknown[];
+    slots?: unknown[];
+}

package/dist/src/interfaces/responses/existing-entities-response.d.ts

@@ -0,0 +1,6 @@
+import type { ExistingComponentEntity } from './existing-component-entity.js';
+import type { ExistingTokenEntity } from './existing-token-entity.js';
+export interface ExistingEntitiesResponse {
+    components: ExistingComponentEntity[];
+    tokens: ExistingTokenEntity[];
+}

package/dist/src/interfaces/responses/existing-token-entity.d.ts

@@ -0,0 +1,6 @@
+export interface ExistingTokenEntity {
+    id: string;
+    name: string;
+    kind: string;
+    value?: unknown;
+}

package/dist/src/lib/agent-model-options.d.ts

@@ -1,13 +1,16 @@
 import type { Command } from 'commander';
 export declare const AGENT_DESCRIPTION: string;
 export declare const MODEL_DESCRIPTION = "Model to use (defaults to a lightweight per-agent model; override with EDS_AGENT_MODEL_<AGENT>)";
+export declare const BEDROCK_DESCRIPTION: string;
 export interface AgentModelOptionsConfig {
     agentDescription?: string;
     includeModel?: boolean;
     modelDescription?: string;
 }
 /**
- * Register --agent and optionally --model flags to a Commander command, with customizable descriptions.
- * Pass `includeModel: false` for commands where the model dimension is not applicable (e.g., mapping-resolution agents that select an agent for logic, not model choice).
+ * Register --agent, --bedrock, and optional --model flags with a Commander
+ * command. Pass includeModel: false to omit --model only — --bedrock is
+ * independent of model selection (it's a routing switch, not a model choice)
+ * and is always registered alongside --agent.
  */
 export declare function addAgentModelOptions(cmd: Command, config?: AgentModelOptionsConfig): Command;

package/dist/src/program.d.ts

@@ -15,5 +15,11 @@ export declare function runBuild(opts: {
 }): Promise<{
     exitCode: number;
 }>;
+/**
+ * Walks `actionCommand` and its ancestors for a truthy `--bedrock`. --bedrock
+ * is registered per-subcommand (not at program scope, unlike --debug), so a
+ * root-level or subcommand-level setting can each carry it.
+ */
+export declare function resolveBedrockFromAncestors(actionCommand: Command): boolean;
 export declare function createProgram(): Command;
 export {};

package/dist/src/session/db.d.ts

@@ -5,7 +5,7 @@ import type { ToolCall, TokenToolCall, ComponentSourceRef } from '@contentful/ex
 import type { ComponentTypeSummary } from '@contentful/experience-design-system-types';
 import type { SlotCycle, SlotEdge } from '../analyze/cycle-detection.js';
 export type StepStatus = 'pending' | 'complete' | 'failed' | 'interrupted';
-export type CommandName = 'analyze extract' | 'analyze select' | 'generate components' | 'generate tokens' | 'generate edit' | 'apply preview' | 'apply select' | 'apply push' | 'print components' | 'print tokens' | 'map tokens' | 'import';
+export type CommandName = 'analyze extract' | 'analyze select' | 'generate components' | 'generate tokens' | 'generate edit' | 'apply preview' | 'apply select' | 'apply push' | 'print components' | 'print tokens' | 'map tokens' | 'fetch existing entities' | 'import';
 export interface SessionRow {
     id: string;
     name: string | null;

package/dist/src/setup/command.d.ts

@@ -1,10 +1,4 @@
 import type { Command } from 'commander';
-import type { AgentName } from '@contentful/experience-design-system-generation';
-export declare function promptCodexModel(ask?: (q: string) => Promise<string>): Promise<string | undefined>;
-export declare function setupAgent(): Promise<{
-    agent: AgentName | undefined;
-    agentModel: string | undefined;
-}>;
 export type SkillPromptKind = 'select' | 'generate';
 /**
  * Prompt the operator for a custom skill prompt path. Returns the resolved

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.32.1-dev-build-10912f6.0",
+  "version": "2.32.1-dev-build-1c6a348.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -39,8 +39,8 @@
     "svelte": "^5.56.4",
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
-    "@contentful/experience-design-system-cli-v2": "2.32.1-dev-build-10912f6.0",
-    "@contentful/experience-design-system-types": "2.32.1-dev-build-10912f6.0"
+    "@contentful/experience-design-system-cli-v2": "2.32.1-dev-build-1c6a348.0",
+    "@contentful/experience-design-system-types": "2.32.1-dev-build-1c6a348.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",
@@ -52,9 +52,9 @@
     "ink-testing-library": "^4.0.0",
     "typescript-eslint": "^8.67.0",
     "vitest": "^4.0.16",
-    "@contentful/experience-design-system-client": "2.32.1-dev-build-10912f6.0",
-    "@contentful/experience-design-system-extraction": "2.32.1-dev-build-10912f6.0",
-    "@contentful/experience-design-system-generation": "2.32.1-dev-build-10912f6.0"
+    "@contentful/experience-design-system-extraction": "2.32.1-dev-build-1c6a348.0",
+    "@contentful/experience-design-system-generation": "2.32.1-dev-build-1c6a348.0",
+    "@contentful/experience-design-system-client": "2.32.1-dev-build-1c6a348.0"
   },
   "repository": {
     "type": "git",