@contentful/experience-design-system-cli 2.30.2-dev-build-1d57a44.0 → 2.30.2-dev-build-2c13c19.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.30.2-dev-build-1d57a44.0",
+  "version": "2.30.2-dev-build-2c13c19.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",

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;

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,22 +275,38 @@ 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 modelArg = ["--model", resolveAgentModel(agent, model)];
+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":
@@ -304,21 +320,25 @@ function buildArgs(agent, prompt2, model, promptViaStdin = false) {
 }
 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", () => {
@@ -436,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";
@@ -453,9 +473,14 @@ 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.4-mini",
+      codex: "gpt-5.6-luna",
       // requires OPENAI_API_KEY; ChatGPT account users must pass --model
       opencode: "claude-haiku-4-5",
       cursor: "gpt-mini",
@@ -463,6 +488,7 @@ var init_agent_runner = __esm({
       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";
   }
 });
 
@@ -852,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,
@@ -27591,6 +27618,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;
@@ -27626,6 +27654,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;
@@ -27668,6 +27697,7 @@ function WizardApp({
   initialHost,
   initialAgent,
   initialModel,
+  bedrock = false,
   initialProjectPath,
   host,
   autoAcceptScope = false,
@@ -27729,6 +27759,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 : "",
@@ -27868,6 +27899,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 = "";
@@ -27988,6 +28020,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 = "";
@@ -28079,6 +28112,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
       });
@@ -28177,6 +28211,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
       })
     ];
@@ -28246,6 +28281,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
       })
@@ -29753,12 +29789,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;
 }
 
@@ -30547,6 +30586,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);
@@ -31790,6 +31835,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;
@@ -32636,6 +32689,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))) {
@@ -34300,6 +34356,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";
 
@@ -34455,6 +34512,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;
@@ -34505,6 +34563,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);
@@ -34566,6 +34625,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");
@@ -35596,6 +35656,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 } : {},
@@ -35624,6 +35689,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,
@@ -35687,6 +35753,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,
@@ -35696,6 +35767,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,
@@ -36833,6 +36905,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");
@@ -36880,6 +36959,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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.30.2-dev-build-1d57a44.0",
+  "version": "2.30.2-dev-build-2c13c19.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.30.2-dev-build-1d57a44.0",
-    "@contentful/experience-design-system-types": "2.30.2-dev-build-1d57a44.0"
+    "@contentful/experience-design-system-cli-v2": "2.30.2-dev-build-2c13c19.0",
+    "@contentful/experience-design-system-types": "2.30.2-dev-build-2c13c19.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.30.2-dev-build-1d57a44.0",
-    "@contentful/experience-design-system-extraction": "2.30.2-dev-build-1d57a44.0",
-    "@contentful/experience-design-system-generation": "2.30.2-dev-build-1d57a44.0"
+    "@contentful/experience-design-system-client": "2.30.2-dev-build-2c13c19.0",
+    "@contentful/experience-design-system-extraction": "2.30.2-dev-build-2c13c19.0",
+    "@contentful/experience-design-system-generation": "2.30.2-dev-build-2c13c19.0"
   },
   "repository": {
     "type": "git",